diff --git a/addons/account/__terp__.py b/addons/account/__openerp__.py
similarity index 83%
rename from addons/account/__terp__.py
rename to addons/account/__openerp__.py
index bfa5f8fb47b..0afe7f878e0 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__openerp__.py
@@ -54,8 +54,22 @@ module named account_voucherss
         'wizard/account_move_line_reconcile_select_view.xml',
         'wizard/account_move_journal_view.xml',
         'account_wizard.xml',
+        'wizard/account_open_closed_fiscalyear_view.xml',
         'wizard/account_move_line_unreconcile_select_view.xml',
+        'wizard/account_vat_view.xml',
+        'wizard/account_print_journal_view.xml',
+        'wizard/account_general_journal_view.xml',
+        'wizard/account_central_journal_view.xml',
         'wizard/account_subscription_generate_view.xml',
+        'wizard/account_fiscalyear_close_view.xml',
+        'wizard/account_state_open_view.xml',
+        'wizard/account_journal_select_view.xml',
+        'wizard/account_change_currency_view.xml',
+        'wizard/account_validate_move_view.xml',
+        'wizard/account_statement_from_invoice_view.xml',
+        'wizard/account_pay_invoice_view.xml',
+        'wizard/account_unreconcile_view.xml',
+        'wizard/account_invoice_state_view.xml',
         'project/wizard/project_account_analytic_line_view.xml',
         'account_view.xml',
         'account_end_fy.xml',
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index e0a316ae2a1..deb010c7cd0 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -27,6 +27,26 @@ from tools.misc import currency
 from tools.translate import _
 
 class account_bank_statement(osv.osv):
+
+    def button_import_invoice(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
+        model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice')], context=context)
+        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        context.update({'statement_id': ids[0]})
+        return {
+            'name': _('Import Invoice'),
+            'context': context,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.statement.from.invoice',
+            'views': [(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'nodestroy': True
+                }
+
     def _default_journal_id(self, cr, uid, context={}):
         if context.get('journal_id', False):
             return context['journal_id']
@@ -352,7 +372,16 @@ class account_bank_statement(osv.osv):
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete bank statement which are already confirmed !'))
         osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
         return True
-    
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if context is None:
+            context = {}
+        default = default.copy()
+        default['move_line_ids'] = []
+        return super(account_bank_statement, self).copy(cr, uid, id, default, context)
+
 account_bank_statement()
 
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index feeb38dd51b..5ef07f6c88b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -54,13 +54,13 @@
                         <page string="Line">
                             <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 name="uos_id"/>
-                            <field name="quantity" select="1"/>
-                            <field name="price_unit" select="1"/>
+                            <field name="quantity"/>
+                            <field name="price_unit"/>
                             <field name="discount"/>
-                            <field colspan="4" name="name" select="1"/>
-                            <field colspan="4" name="origin" select="1"/>
+                            <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_user"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user,base.group_extended"/>
                             <newline/>
                             <field name="price_subtotal"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -94,11 +94,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Manual Invoice Taxes">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field name="sequence"/>
-                    <field name="account_id" select="1" groups="base.group_user"/>
-                    <field name="manual" select="1"/>
-                    <field name="amount" select="1"/>
+                    <field name="account_id" groups="base.group_user"/>
+                    <field name="manual"/>
+                    <field name="amount"/>
                     <field name="base" readonly="0"/>
                     <separator colspan="4" string="Tax codes"/>
                     <field name="base_code_id"/>
@@ -115,7 +115,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');black:state not in ('draft')" string="Invoice">
-                    <field name="date_invoice" select="1"/>
+                    <field name="date_invoice"/>
                     <field name="number"/>
                     <field name="partner_id" groups="base.group_user"/>
                     <field name="name"/>
@@ -142,14 +142,16 @@
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
                     <group col="6" colspan="4">
-                        <field domain="[('type', '=', 'purchase')]" name="journal_id" select="2"/>
-                        <field name="type" readonly="1" select="2"/>
-                        <field name="number" select="1" readonly="1"/>
-                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" select="1" context="{'default_customer': 0}"/>
+                        <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
+                        <field name="number" readonly="1"/>
+                        <field name="type" invisible="1"/>
+                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)"/>
+                        <newline/>
+                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-
-                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" select="2"/>
-                        <field name="date_invoice" select="1"/>
+                        <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                        <newline/>
+                        <field name="date_invoice"/>
                         <field name="period_id" groups="base.group_user"/>
                         <group colspan="2" col="1" groups="base.group_user">
                             <label align="0.0" string="(keep empty to use the current period)"/>
@@ -158,9 +160,9 @@
                     <notebook colspan="4">
                         <page string="Invoice">
                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
-                            <field name="reference_type" nolabel="1" select="2" size="0"/>
-                            <field name="reference" nolabel="1" select="1"/>
-                            <field name="date_due" select="1"/>
+                            <field name="reference_type" nolabel="1" size="0"/>
+                            <field name="reference" nolabel="1"/>
+                            <field name="date_due"/>
                             <field name="check_total" required="2"/>
                             <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
                                 <tree string="Invoice lines">
@@ -195,32 +197,31 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" select="2"/>
+                                <field name="state"/>
                                 <field name="residual"/>
                                 <group col="3" colspan="4">
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                    <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                 </group>
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)" select="2"/>
+                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)"/>
 
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
-                            <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                             <newline/>
                             <field name="payment_term" widget="selection"/>
-                            <field name="name" select="2"/>
+                            <field name="name"/>
                             <newline/>
-                            <field name="origin" select="2"/>
-                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
+                            <field name="origin" groups="base.group_extended"/>
+                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
                             <field name="move_id"/>
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
-                        <page string="Payments">
+                        <page string="Payments" groups="base.group_extended">
                             <field name="payment_ids" colspan="4" nolabel="1" >
                                 <tree string="Payments">
                                     <field name="date"/>
@@ -247,13 +248,17 @@
             <field name="arch" type="xml">
                 <form string="Invoice">
                     <group colspan="4" col="6">
-                        <field name="journal_id" select="2" groups="base.group_user"/>
-                        <field name="type" readonly="1" select="2"/>
-                        <field name="number" select="1"/>
-                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" select="1" groups="base.group_user"/>
+                        <field name="journal_id" groups="base.group_user"/>
+                        <field name="number"/>
+                        <field name="type" invisible="1"/>
+                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)"/>
+                        <newline/>
+                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" select="2"/>
-                        <field name="date_invoice" select="1"/>
+                        <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                        <newline/>
+
+                        <field name="date_invoice"/>
                         <field name="period_id" groups="base.group_user"/>
                         <group colspan="2" col="1" groups="base.group_user">
                             <label align="0.0" string="(keep empty to use the current period)"/>
@@ -262,7 +267,7 @@
                     <notebook colspan="4">
                         <page string="Invoice">
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
-                            <field name="name" select="2"/>
+                            <field name="name"/>
                             <field name="payment_term" widget="selection"/>
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
                             <group col="1" colspan="2">
@@ -283,27 +288,28 @@
                                 <field name="amount_tax"/>
                                 <field name="reconciled"/>
                                 <field name="amount_total"/>
-                                <field name="state" select="2"/>
+                                <field name="state"/>
                                 <field name="residual"/>
                                 <group col="3" colspan="4" groups="base.group_user">
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                    <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                 </group>
                             </group>
                         </page>
                         <page string="Other Info">
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection"  groups="base.group_multi_company"/>
-                            <field name="fiscal_position" groups="base.group_extended,base.group_user" widget="selection"/>
                             <newline/>
                             <field name="date_due"/>
                             <field name="user_id"/>
                             <newline/>
-                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank" select="2"/>
-                            <field name="origin" select="2"/>
-                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
+                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank"
+                                groups="base.group_extended"/>
+                            <field name="origin"/>
+                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
+                                groups="base.group_extended"/>
                             <field name="move_id" groups="base.group_user"/>
                             <separator colspan="4" string="Additionnal Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
@@ -340,9 +346,7 @@
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
-                        <field name="user_id">
-                            <filter string="My Invoices" icon="terp-account" domain="[('user_id','=',uid)]"/>
-                        </field>
+                        <field name="user_id" default="uid"/>
                         <field name="origin"/>
                         <field name="amount_total"/>
                     </group>
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 5c99ebdde13..9d449f116f4 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -24,25 +24,33 @@
 
         <report id="account_move_line_list" model="account.tax.code" name="account.tax.code.entries" rml="account/report/account_tax_code.rml" string="All Entries"/>
 
-        <report auto="False" id="account_vat_declaration" menu="False" model="account.tax.code" name="account.vat.declaration" rml="account/report/tax_report.rml" string="Taxes Report"/>
+        <report
+        	auto="False"
+        	id="account_vat_declaration"
+        	menu="False"
+        	model="account.tax.code"
+        	name="account.vat.declaration"
+        	rml="account/report/tax_report.rml"
+        	string="Taxes Report"/>
 
         <menuitem
             id="menu_tax_report"
             name="Taxes"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
 
-        <wizard
+<!--        <wizard
             id="wizard_vat_declaration"
             menu="False"
             model="account.tax.code"
             name="account.vat.declaration"
-            string="Print Taxes Report"/>
-        <menuitem
+            string="Print Taxes Report"/> -->
+
+<!--        <menuitem
             icon="STOCK_PRINT"
             action="wizard_vat_declaration"
             id="menu_wizard_vat_declaration"
             parent="menu_tax_report"
-            type="wizard"/>
+            type="wizard"/> -->
 
 
         <record id="action_tax_code_tree" model="ir.actions.act_window">
@@ -66,6 +74,7 @@
 			rml="account/report/compare_account_balance.rml"
 			auto="False"
 			menu="False"/>
+
 		<report id="account_account_balance_landscape"
 			string="Account balance"
 			model="account.account"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 88462098852..c0bd50eb7bc 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -17,7 +17,7 @@
                     <field name="date_start"/>
                     <field name="date_stop"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="end_journal_period_id"/>
+                    <field name="end_journal_period_id" groups="base.group_extended"/>
                     <separator colspan="4" string="Periods"/>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
                         <form string="Period">
@@ -122,16 +122,16 @@
                     <field name="name" select="1" colspan="4"/>
                     <field name="code" select="1"/>
                     <field name="parent_id"/>
-                    <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="user_type" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <newline/>
-                            <field name="currency_id" select="2"/>
-                            <field name="currency_mode" select="2"/>
+                            <field name="currency_id"/>
+                            <field name="currency_mode"/>
                             <field name="reconcile"/>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <field name="check_history"/>
                             <field name="type" select="1"/>
                             <newline/>
@@ -338,10 +338,11 @@
                     <field name="date" select="1"/>
                     <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
                     <field name="currency"/>
-                    <field name="period_id" select="2"/>
+                    <field name="period_id"/>
                     <group colspan="2" col="3">
-                        <button name="%(wizard_populate_statement_from_inv)d"
-                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>
+<!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
+<!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
+                    	<button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>
                     </group>
                     <newline/>
                     <field name="balance_start"/>
@@ -381,7 +382,7 @@
                         </page>
                     </notebook>
                     <group col="7" colspan="4">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <field name="balance_end"/>
                         <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object"  icon="gtk-apply"/>
@@ -598,14 +599,14 @@
                         <field name="name" select="1"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="description" select="1"/>
-                        <field name="active" select="2"/>
+                        <field name="active"/>
                         <field name="tax_group" select="1"/>
                         <field name="type"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Tax Definition">
                             <field name="applicable_type"/>
-                            <field name="amount" select="2" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
+                            <field name="amount" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
                             <field groups="base.group_extended" name="include_base_amount"/>
                             <field groups="base.group_extended" name="domain"/>
                             <newline/>
@@ -652,23 +653,7 @@
         </record>
         <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
 
-
-
-        <!--
-    Entries Journal lines
-    -->
-
-        <wizard id="action_move_journal_line_form_select" menu="False" model="account.move.line" name="account.move.journal.select" string="Standard entry"/>
-
-        <record id="ir_open_journal_period" model="ir.values">
-            <field name="key2">tree_but_open</field>
-            <field name="model">account.journal.period</field>
-            <field name="name">Open Journal</field>
-            <field eval="'ir.actions.wizard,%d'%action_move_journal_line_form_select" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
-
- <!--       <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/>
+<!--       <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/>
         <menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard" sequence="5"/>
 -->
         <!--
@@ -716,23 +701,23 @@
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
                             <field name="date" select="1"/>
-                            <field name="ref" select="2"/>
-                            <field name="invoice" select="2"/>
+                            <field name="ref"/>
+                            <field name="invoice"/>
                             <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
 
-                            <field name="debit" select="2"/>
-                            <field name="credit" select="2"/>
+                            <field name="debit"/>
+                            <field name="credit"/>
                             <field name="company_id" required="1" groups="base.group_multi_company"/>
 
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
-                            <field name="quantity" select="2"/>
+                            <field name="quantity"/>
                             <field name="move_id" required="False"/>
                             <newline/>
-                            <field name="statement_id" select="2"/>
-                            <field name="blocked" select="2"/>
+                            <field name="statement_id"/>
+                            <field name="blocked"/>
                             <field name="date_maturity"/>
                             <field name="date_created"/>
                             <newline/>
@@ -743,11 +728,11 @@
                             <field name="analytic_account_id"/>
 
                             <separator colspan="4" string="State"/>
-                            <field name="journal_id" select="2"/>
+                            <field name="journal_id"/>
                             <field name="period_id"/>
                             <field name="reconcile_id"/>
                             <field name="reconcile_partial_id"/>
-                            <field name="state" select="2"/>
+                            <field name="state"/>
                         </page>
                         <page string="Analytic Lines">
                             <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
@@ -769,14 +754,14 @@
                         <page string="Information">
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
-                            <field name="date" select="2"/>
+                            <field name="date"/>
                             <field name="journal_id" readonly="False" select="1"/>
-                            <field name="period_id" readonly="False" select="2"/>
+                            <field name="period_id" readonly="False"/>
                             <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="partner_id" select="2" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
                             <newline/>
-                            <field name="debit" select="2"/>
-                            <field name="credit" select="2"/>
+                            <field name="debit"/>
+                            <field name="credit"/>
 
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
@@ -795,7 +780,7 @@
                             <newline/>
                             <field name="reconcile_id"/>
                             <field name="reconcile_partial_id"/>
-                            <field name="state" select="2"/>
+                            <field name="state"/>
                         </page>
                         <page string="Analytic Lines">
                             <field colspan="4" name="analytic_lines" nolabel="1"/>
@@ -876,13 +861,13 @@
                 <form string="Account Entry">
                     <group colspan="4" col="6">
                     <field name="name" select="1" readonly="True"/>
-                    <field name="period_id" select="2"/>
+                    <field name="period_id"/>
                     <field name="journal_id" select="1"/>
                     <field name="company_id" required="1" groups="base.group_multi_company"/>
                     <field name="date" select="1"/>
                     <field name="ref" select="1"/>
-                    <field name="to_check" select="2"/>
-                    <field name="type" select="2" groups="base.group_extended"/>
+                    <field name="to_check"/>
+                    <field name="type" groups="base.group_extended"/>
                     </group>
                     <field name="partner_id" invisible="1" select="1"/>
                     <field name="amount" invisible="1" select="1"/>
@@ -932,7 +917,7 @@
                         </tree>
                     </field>
                     <separator colspan="4" string="Narration"/>
-                    <field name="narration" select="2" colspan="4" nolabel="1"/>
+                    <field name="narration" colspan="4" nolabel="1"/>
                     <separator colspan="4" string="State"/>
                     <field name="state" select="1"/>
                     <group col="2" colspan="2">
@@ -1056,7 +1041,7 @@
                         </page>
                     </notebook>
                     <group col="7" colspan="4">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <field name="balance_end"/>
                         <button name="button_dummy" states="draft" string="Compute" icon="gtk-execute"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
@@ -1330,7 +1315,7 @@
 
                     <separator colspan="4" string="Subscription Periods"/>
                     <field name="date_start" select="1"/>
-                    <field name="period_total" select="2"/>
+                    <field name="period_total"/>
 
                     <field name="period_nbr"/>
                     <field name="period_type"/>
@@ -1343,7 +1328,7 @@
                     <field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/>
 
                     <separator colspan="4" string="State"/>
-                    <field name="state" select="2"/>
+                    <field name="state"/>
                     <group col="1" colspan="2">
                         <button name="state_draft" states="done" string="Set to Draft" type="object"  icon="gtk-convert" />
                     </group>
@@ -1500,6 +1485,7 @@
         <!-- register configuration wizard -->
         <record id="config_fiscalyear" model="ir.actions.todo">
             <field name="action_id" ref="action_account_config_wizard_form"/>
+            <field name="restart">onskip</field>
         </record>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
@@ -1549,7 +1535,7 @@
                             <field name="type" select="1"/>
                             <field name="user_type" select="1"/>
 
-                            <field name="currency_id" select="2"/>
+                            <field name="currency_id"/>
                             <field name="reconcile"/>
                             <field name="tax_ids" colspan="4"/>
                         </page>
@@ -1642,13 +1628,13 @@
                         <newline/>
                         <field name="chart_template_id" select="1"/>
                         <field name="tax_group" select="1"/>
-                        <field name="type" select="2"/>
-                        <field name="type_tax_use" select="2"/>
+                        <field name="type"/>
+                        <field name="type_tax_use"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Tax Definition">
                             <field name="applicable_type"/>
-                            <field name="amount" select="2" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
+                            <field name="amount" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
                             <field groups="base.group_extended" name="include_base_amount"/>
                             <field groups="base.group_extended" name="domain"/>
                             <newline/>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 1597ec8898e..148491fb2a1 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -16,42 +16,22 @@
 
 
 
-        <wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice" groups="base.group_user"/>
+        <!--  wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice" groups="base.group_user"/-->
 
         <!-- close year, period, journal -->
-        <wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Generate Fiscal Year Opening Entries"/>
-
-        <menuitem
-            action="wizard_fiscalyear_close"
-            id="menu_wizard_fy_close"
-            parent="menu_account_end_year_treatments"
-            type="wizard"
-            sequence="1"/>
+<!--        <wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Generate Fiscal Year Opening Entries"/>-->
+<!---->
+<!--        <menuitem-->
+<!--            action="wizard_fiscalyear_close"-->
+<!--            id="menu_wizard_fy_close"-->
+<!--            parent="menu_account_end_year_treatments"-->
+<!--            type="wizard"-->
+<!--            sequence="1"/>-->
 
   <!--     <wizard id="wizard_fiscalyear_close_state" menu="False" model="account.fiscalyear" name="account.fiscalyear.close.state" string="Close a Fiscal Year"/>
         <menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" type="wizard"/>
  -->
 
-        <wizard
-            id="wizard_open_closed_fiscalyear"
-            menu="False"
-            model="account.fiscalyear"
-            name="account.open_closed_fiscalyear"
-            string="Cancel Opening Entries"/>
-        <menuitem
-            action="wizard_open_closed_fiscalyear"
-            id="menu_wizard_open_closed_fy"
-            sequence="2"
-            parent="account.menu_account_end_year_treatments" type="wizard"/>
-<!--  period close
-
-
-       <wizard id="wizard_period_close" model="account.period" name="account.period.close" string="Close a Period"/>
-
-      <wizard id="action_account_period_close" model="account.period" name="account.period.close" string="Close a Period"/>
-
-
--->
         <!-- automatic reconcile -->
         <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
         <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/>
@@ -59,17 +39,17 @@
 
         <!-- Import entry in statement -->
 
-        <wizard
-            string="Import invoices"
-            model="account.bank.statement"
-            name="populate_statement_from_inv"
-            menu="False"
-            id="wizard_populate_statement_from_inv"/>
+<!--        <wizard-->
+<!--            string="Import invoices"-->
+<!--            model="account.bank.statement"-->
+<!--            name="populate_statement_from_inv"-->
+<!--            menu="False"-->
+<!--            id="wizard_populate_statement_from_inv"/>-->
 
         <!-- manual reconcile -->
         <wizard id="wizard_reconcile" model="account.move.line" name="account.move.line.reconcile" string="Reconcile Entries"/>
 
-        <wizard id="wizard_reconcile_unreconcile" model="account.move.reconcile" name="account.reconcile.unreconcile" string="Unreconcile Entries"/>
+<!--        <wizard id="wizard_reconcile_unreconcile" model="account.move.reconcile" name="account.reconcile.unreconcile" string="Unreconcile Entries"/>-->
 
 
  <!--       <wizard id="wizard_reconcile_select" menu="False" model="account.move.line" name="account.move.line.reconcile.select" string="Reconcile entries"/>
@@ -77,7 +57,7 @@
  -->
 
         <!-- unreconcile -->
-        <wizard id="wizard_unreconcile" model="account.move.line" name="account.move.line.unreconcile" string="Unreconcile Entries"/>
+<!--        <wizard id="wizard_unreconcile" model="account.move.line" name="account.move.line.unreconcile" string="Unreconcile Entries"/>-->
 
 <!--   unreconcile
 
@@ -105,15 +85,15 @@
         <wizard id="wizard_balance_report" keyword="client_print_multi" model="account.account" name="account.account.balance.report" string="Account Balance"/>
         <wizard id="wizard_general_ledger_report" keyword="client_print_multi" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
 
-        <wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices" groups="base.group_user"/>
-        <wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices" groups="base.group_user"/>
-
+<!--        <wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices" groups="base.group_user"/>-->
+<!--        <wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices" groups="base.group_user"/>-->
+<!---->
 
         <!-- account.move validate -->
-        <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Ledger Postings"/>
+<!--        <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Ledger Postings"/>
         <menuitem action="wizard_validate_account_moves" id="menu_validate_account_moves" parent="account.menu_finance_periodical_processing" type="wizard"/>
 
-        <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Ledger Postings"/>
+        <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Ledger Postings"/>-->
 
 		<!-- Use Models -->
         <wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>
@@ -122,7 +102,7 @@
         <wizard string="Create Entries From Models" model="account.move.line" name="account_use_models" menu="True" id="wizard_line_account_use_model"/>
 
 		<!-- account.invoice -->
-	    <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open" groups="base.group_user"/>
+<!--    <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open" groups="base.group_user"/> -->
 
 	    <!-- generic report wizard -->
 	    <wizard id="wizard_account_balance_report" menu="False" model="account.account" name="account.account.balance.report" string="Account Balance"/>
@@ -131,15 +111,15 @@
 		<wizard id="wizard_general_ledger" menu="False" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
         <menuitem icon="STOCK_PRINT" action="wizard_general_ledger" id="menu_general_ledger" parent="account.menu_generic_report" type="wizard"/>
 
-        <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print Journal" />
+<!--        <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" />
 
         <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Print Central Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_central_journal" parent="account.menu_generic_report" type="wizard" />
 
         <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General Journal" />
-		<menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />
+		<menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />-->
 
-        <wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/>
+<!--        <wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/>-->
     </data>
 </openerp>
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 05d04492af0..f69b3246eff 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 9a2a840dd23..91dfbca2279 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-17 23:18+0000\n"
-"Last-Translator: Sianna <Unknown>\n"
+"PO-Revision-Date: 2010-04-17 18:26+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@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-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -55,7 +55,7 @@ msgstr "Актив"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: account
 #: help:account.journal,currency:0
@@ -257,7 +257,7 @@ msgstr "Данъци за доставчици"
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr ""
+msgstr "Общ дебит"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -370,7 +370,7 @@ msgstr "Аналитична сметка"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Данък върху подчинени"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -387,7 +387,7 @@ msgstr "Описание на фактура"
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Грешка! Не можете да създадете рекурсивни аналитични сметки."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -398,7 +398,7 @@ msgstr "Общо записи"
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Счетоводен източник"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -537,7 +537,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
 msgid "Tax Templates"
-msgstr ""
+msgstr "Шаблони на данъци"
 
 #. module: account
 #: field:account.invoice,reconciled:0
@@ -552,13 +552,13 @@ msgstr "Отложен метод"
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Включване в основната сума"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Базов код на обезщетение"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -591,7 +591,7 @@ msgstr "account.tax"
 #. module: account
 #: rml:account.central.journal:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Дата на отпечатване"
 
 #. module: account
 #: rml:account.general.ledger:0
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 2b1c2ae8c8c..d1da22ef906 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 40039ff8925..9f2c82ec366 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-31 12:45+0000\n"
+"PO-Revision-Date: 2010-04-18 09:39+0000\n"
 "Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
 "tic.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-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -41,7 +41,7 @@ msgstr "Codificació assentaments"
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Especifiquel el missage per als pagaments fora de termini."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -326,7 +326,7 @@ msgstr "Origen"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Nom de l'assentament"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -436,7 +436,7 @@ msgstr "Negatiu"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "(Compte/Empresa) Nom"
 
 #. module: account
 #: selection:account.move,type:0
@@ -482,7 +482,7 @@ msgstr "Conciliació bancària"
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Desc.(%)"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -1160,7 +1160,7 @@ msgstr "Preu un."
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "Període des de:"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1353,7 +1353,7 @@ msgstr "Homòleg centralitzat"
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1516,7 +1516,7 @@ msgstr "Tanca estats"
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr ""
+msgstr "wizard.company.setup"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
@@ -1854,7 +1854,7 @@ msgstr "Compte director"
 #. 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
@@ -2186,7 +2186,7 @@ msgstr "Assentament analític"
 #. module: account
 #: view:res.company:0 field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Missatge de pagaments fora de termini"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2488,7 +2488,7 @@ msgstr "Obre diari"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "KI"
-msgstr ""
+msgstr "KI"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_account_analytic_line
@@ -2681,7 +2681,7 @@ msgstr "Patrimoni"
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr ""
+msgstr "Missage dels pagaments fora de termini"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
@@ -2743,7 +2743,7 @@ msgstr "-"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "asgfas"
-msgstr ""
+msgstr "asgfas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -3898,7 +3898,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
 #: view:wizard.company.setup:0
 msgid "Overdue Payment Report Message"
-msgstr ""
+msgstr "Missatge de l'informe dels pagaments fora de termini"
 
 #. module: account
 #: selection:account.tax,tax_group:0
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 21e7c708e8f..9509913faa4 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-10 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index bc70bb1a51f..55cb096e90e 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+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 deca642f62a..e978a71d610 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-02 07:16+0000\n"
+"PO-Revision-Date: 2010-04-16 09:47+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -731,7 +731,7 @@ msgstr "Gesamtschulden eines Kunden"
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr "Steuer"
+msgstr "Beleg"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_line_open
@@ -983,7 +983,7 @@ msgstr "Standard Debitoren Konto"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr "Buchen Bankauszug"
+msgstr "Buchungen Beleg"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -1776,7 +1776,7 @@ msgstr "Aufwandskonto für Periode"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr "Neuer Bankauszug"
+msgstr "neuer Beleg"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -2367,7 +2367,7 @@ msgstr "Steuerart"
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr "Bankauszug Erfassung"
+msgstr "Beleg Erfassen"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
@@ -2509,7 +2509,7 @@ msgstr "Gültig ab"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Bankauszug"
+msgstr "Bank beleg"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
@@ -2964,7 +2964,7 @@ msgstr "Entwurf Lieferanten Gutschriften"
 #. module: account
 #: model:process.node,name:account.process_node_accountingstatemententries0
 msgid "Accounting Statement"
-msgstr "Bankauszug"
+msgstr "Buchungsbeleg"
 
 #. module: account
 #: rml:account.overdue:0
@@ -3933,7 +3933,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 msgid "Encode manually the statement"
-msgstr "Bankauszug manuell erfassen"
+msgstr "manuelle Belegerfassung"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_form
@@ -4096,7 +4096,7 @@ msgstr "Belegnummer"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Buchungszeilen"
+msgstr "Belegzeilen"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
@@ -4445,7 +4445,7 @@ msgstr "Abbrechen Buchen Jahreseröffnung"
 #. module: account
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manually statement"
-msgstr "Manuelle Ausgabe"
+msgstr "Manueller Beleg"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
@@ -4659,7 +4659,7 @@ msgstr ""
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
 msgid "Statement"
-msgstr "Bankkontoauszug"
+msgstr "Beleg"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
@@ -4736,7 +4736,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "Entwurf Bankauszug"
+msgstr "Beleg Entwurf"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -4841,7 +4841,7 @@ msgstr "Abgebrochen"
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "Buchen Bankauszug Entwurf"
+msgstr "Beleg Entwurf"
 
 #. module: account
 #: wizard_field:populate_statement_from_inv,init,date:0
@@ -5309,7 +5309,7 @@ msgstr "Anzeige Zahlungen"
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Accounting entries at statement's confirmation"
-msgstr "Buchungen nach Bestätigung Bankauszug"
+msgstr "Buchungen nach Bestätigung Beleg"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -5392,7 +5392,7 @@ msgstr "Teilbuchung"
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "Bankauszug für Ausbuchen offener Posten (Debitoren/Kreditoren)"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -6017,12 +6017,12 @@ msgstr "Positionen Summen & Salden"
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement Process"
-msgstr "Ausgabe Prozessansicht"
+msgstr "Beleg Prozess"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
 msgid "Statement reconcile"
-msgstr "Offene Posten Buchungen Bankauszug"
+msgstr "Beleg OP-Ausgleich"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,sure:0
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index a0d1b48c02c..f2e5ed77ea6 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index f06d1d557c4..0a2b2c626d6 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-12 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index bfdfdb0e2e0..f578cbc7493 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+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 a695b23a38e..0f0f933abdb 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 24d1ac79460..fbe197f9df7 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 8b424a58ea9..95af7a94323 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index b15135c8e14..b5274399fea 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index ed4e446c505..ffb5f882d9b 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 1bdf36f4f2a..65856053bdd 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 5d1eeafaeb5..3a997d3000f 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 97e852826b5..e6b360683ea 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 79173201627..c8349d8f0c5 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 8fd404dcb4a..1d999f12888 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+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 3d3cbc954e8..79335be4e75 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index ee1ad776c89..67801be10cf 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index c446f87351a..e97724467c6 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+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 d264385f50e..0adf15c8787 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index bf1f411e1e0..e17722af03f 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 4fc0e27c353..11bab9eed81 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 1aa65154364..e27d8cc9677 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 35744c95e2c..ea10f588dc6 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 754e25e6db7..c9fda154dab 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 76be8f5bd5c..a322bf511b0 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+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 a172b900b51..1024770b903 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-12 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 797e320727b..2f23e7ccc7e 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index ad56e423751..deb3ee9afb8 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index d2e837753f4..30c07e9f381 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index abc9d069167..9e34bba0b59 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 18d9c8d9dd1..b717c4bfcec 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index a77e6acb015..7d8c17aee9a 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index 4d7be78fa98..ae98b095426 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+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 98dbcd66459..de0b5913aa6 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index f5b0253dfdd..95942c7afbd 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:07+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 e49764b15f5..c1c5599e2d3 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 081257a0bc2..53daa3531e5 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index b39fc960c96..3c3e7026dea 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index d6efbb8c4bb..dbda43952e8 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+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 31b7274f430..6f445a81528 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index d85415dd4ca..fb52db34f13 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index c2332e4d4a6..b83ea120c76 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+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 247ae5c4ab4..f904e3f8d45 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index 45a2e3de05f..fa207ddcf49 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index cb11473c1ec..71ba0be0acf 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index e79774e36e4..c66dda115b2 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -324,6 +324,17 @@ class account_invoice(osv.osv):
         'user_id': lambda s,cr,u,c: u,
     }
 
+    def create(self, cr, uid, vals, context={}):
+        try:
+            res = super(account_invoice, self).create(cr, uid, vals, context)
+            return res
+        except Exception,e:
+            if '"journal_id" viol' in e.args[0]:
+                raise except_orm(_('Configuration Error!'),
+                     _('There is no Accounting Journal of type Sale/Purchase defined!'))
+            else:
+                raise except_orm(_('UnknownError'), str(e))
+            
     def unlink(self, cr, uid, ids, context=None):
         invoices = self.read(cr, uid, ids, ['state'])
         unlink_ids = []
@@ -443,8 +454,9 @@ class account_invoice(osv.osv):
         return {'value': {}}
 
     def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id):
-        val={}
-        dom={}
+        val = {}
+        dom = {}
+        obj_journal = self.pool.get('account.journal')
         if company_id and part_id and type:
             acc_id = False
             partner_obj = self.pool.get('res.partner').browse(cr,uid,part_id)
@@ -488,13 +500,20 @@ class account_invoice(osv.osv):
                                 _('invoice line account company is not match with invoice company.'))
                         else:
                             continue
-        if company_id:
-            val['journal_id']=False
-            journal_ids=self.pool.get('account.journal').search(cr,uid,[('company_id','=',company_id)])
-            dom={'journal_id':  [('id','in',journal_ids)]}
+        if company_id and type:
+            if type in ('out_invoice', 'out_refund'):
+                journal_type = 'sale'
+            else:
+                journal_type = 'purchase'
+            journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
+            if journal_ids:
+                val['journal_id'] = journal_ids[0]
+            else:
+                raise osv.except_osv(_('Configration Error !'),
+                                _('Can not find account journal for this company in invoice, Please Create journal.'))
+            dom = {'journal_id':  [('id', 'in', journal_ids)]}
         else:
-            journal_ids=self.pool.get('account.journal').search(cr,uid,[])
-            dom={'journal_id':  [('id','in',journal_ids)]}
+            journal_ids = obj_journal.search(cr, uid, [])
 
         if currency_id and company_id:
             currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
@@ -644,6 +663,7 @@ class account_invoice(osv.osv):
     def compute_invoice_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines):
         total = 0
         total_currency = 0
+        cur_obj = self.pool.get('res.currency')
         for i in invoice_move_lines:
             if inv.currency_id.id != company_currency:
                 i['currency_id'] = inv.currency_id.id
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 0b2291224a9..494c0f71a48 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -71,7 +71,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <notebook>
-                    <page string="Accounting" position="inside">
+                <page string="Accounting" position="inside">
                     <group col="2" colspan="2">
                         <separator string="Customer Accounting Properties" colspan="2"/>
                         <field name="property_account_receivable"/>
@@ -84,23 +84,23 @@
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Customer Credit" colspan="2"/>
-                        <field name="credit" select="2"/>
-                        <field name="credit_limit" select="2"/>
+                        <field name="credit"/>
+                        <field name="credit_limit" groups="base.group_extended"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Supplier Debit" colspan="2"/>
-                        <field name="debit" select="2"/>
+                        <field name="debit"/>
                     </group>
-                    <field colspan="4" context="{'address': address}" name="bank_ids" nolabel="1" select="2">
+                    <field colspan="4" context="{'address': address}" name="bank_ids" nolabel="1">
                         <form string="Bank account">
-                            <field name="state" select="2"/>
+                            <field name="state"/>
                             <newline/>
                             <field name="acc_number" select="1"/>
                             <newline/>
                             <field name="bank"/>
                             <newline/>
                             <field name="sequence"/>
-                            <field colspan="4" name="name" select="2"/>
+                            <field colspan="4" name="name"/>
                             <separator colspan="4" string="Bank account owner"/>
                             <field colspan="4" name="owner_name"/>
                             <field colspan="4" name="street"/>
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 1000cef2156..0095cb1505c 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -11,8 +11,8 @@
                     <page string="Accounting">
                         <separator string="Sales Properties" colspan="2"/>
                         <separator string="Purchase Properties" colspan="2"/>
-                        <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />
-                        <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
+                        <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"  groups="base.group_extended"/>
+                        <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"  groups="base.group_extended"/>
 
                         <separator string="Sale Taxes" colspan="2"/>
                         <separator string="Purchase Taxes" colspan="2"/>
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 830f8152120..5b8418be430 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,19 +15,19 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-
 import time
+
 from report import report_sxw
 
 #
 # Use period and Journal for selection or resources
 #
 class journal_print(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
+    def __init__(self, cr, uid, name, context={}):
         super(journal_print, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
@@ -37,11 +37,13 @@ class journal_print(report_sxw.rml_parse):
         })
 
     def lines(self, period_id, journal_id, sort_selection='date', *args):
-        if type(period_id)==type([]):
+        obj_jperiod = self.pool.get('account.journal.period')
+        obj_mline = self.pool.get('account.move.line')
+        if type(period_id) == type([]):
             ids_final = []
             for journal in journal_id:
                 for period in period_id:
-                    ids_journal_period = self.pool.get('account.journal.period').search(self.cr,self.uid, [('journal_id','=',journal),('period_id','=',period)])
+                    ids_journal_period = obj_jperiod.search(self.cr, self.uid, [('journal_id','=',journal), ('period_id','=',period)])
                     if ids_journal_period:
                         self.cr.execute('update account_journal_period set state=%s where journal_id=%s and period_id=%s and state=%s', ('printed',journal,period,'draft'))
                         self.cr.commit()
@@ -50,14 +52,14 @@ class journal_print(report_sxw.rml_parse):
                         ids_final.append(ids)
             line_ids = []
             for line_id in ids_final:
-                a = self.pool.get('account.move.line').browse(self.cr, self.uid, line_id )
+                a = obj_mline.browse(self.cr, self.uid, line_id)
                 line_ids.append(a)
             return line_ids
         self.cr.execute('update account_journal_period set state=%s where journal_id=%s and period_id=%s and state=%s', ('printed',journal_id,period_id,'draft'))
         self.cr.commit()
         self.cr.execute('select id from account_move_line where period_id=%s and journal_id=%s and state<>\'draft\' order by date,id', (period_id, journal_id))
         ids = map(lambda x: x[0], self.cr.fetchall())
-        return self.pool.get('account.move.line').browse(self.cr, self.uid, ids )
+        return obj_mline.browse(self.cr, self.uid, ids)
 
     def _sum_debit(self, period_id, journal_id):
         self.cr.execute('select sum(debit) from account_move_line where period_id=%s and journal_id=%s and state<>\'draft\'', (period_id, journal_id))
@@ -66,8 +68,9 @@ class journal_print(report_sxw.rml_parse):
     def _sum_credit(self, period_id, journal_id):
         self.cr.execute('select sum(credit) from account_move_line where period_id=%s and journal_id=%s and state<>\'draft\'', (period_id, journal_id))
         return self.cr.fetchone()[0] or 0.0
-report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print,header=False)
-report_sxw.report_sxw('report.account.journal.period.print.wiz', 'account.journal.period', 'addons/account/report/wizard_account_journal.rml', parser=journal_print,header=False)
+
+report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header=False)
+report_sxw.report_sxw('report.account.journal.period.print.wiz', 'account.journal.period', 'addons/account/report/wizard_account_journal.rml', parser=journal_print, header=False)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/report/central_journal.py b/addons/account/report/central_journal.py
index 9bc2cfdd1b9..36c61b877ff 100644
--- a/addons/account/report/central_journal.py
+++ b/addons/account/report/central_journal.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -59,8 +59,8 @@ class journal_print(report_sxw.rml_parse):
     def _sum_credit(self, period_id, journal_id):
         self.cr.execute('select sum(credit) from account_move_line where period_id=%s and journal_id=%s and state<>\'draft\'', (period_id, journal_id))
         return self.cr.fetchone()[0] or 0.0
-report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/central_journal.rml',parser=journal_print, header=False)
-report_sxw.report_sxw('report.account.central.journal.wiz', 'account.journal.period', 'addons/account/report/wizard_central_journal.rml',parser=journal_print, header=False)
+report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/central_journal.rml', parser=journal_print, header=False)
+report_sxw.report_sxw('report.account.central.journal.wiz', 'account.journal.period', 'addons/account/report/wizard_central_journal.rml', parser=journal_print, header=False)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/report/general_journal.py b/addons/account/report/general_journal.py
index 2da07e04cfd..112ce970694 100644
--- a/addons/account/report/general_journal.py
+++ b/addons/account/report/general_journal.py
@@ -122,8 +122,8 @@ class journal_print(report_sxw.rml_parse):
             return 0.0
         self.cr.execute('select sum(credit) from account_move_line where period_id =ANY(%s)  and journal_id =ANY(%s) and state<>\'draft\'',(self.period_ids,self.journal_ids,))
         return self.cr.fetchone()[0] or 0.0
-report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml',parser=journal_print)
-report_sxw.report_sxw('report.account.general.journal.wiz', 'account.journal.period', 'addons/account/report/wizard_general_journal.rml',parser=journal_print, header=False)
+report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml', parser=journal_print)
+report_sxw.report_sxw('report.account.general.journal.wiz', 'account.journal.period', 'addons/account/report/wizard_general_journal.rml', parser=journal_print, header=False)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py
index 3910622ad68..daa010a0453 100644
--- a/addons/account/report/tax_report.py
+++ b/addons/account/report/tax_report.py
@@ -20,16 +20,15 @@
 ##############################################################################
 
 import time
-import pooler
-import rml_parse
 import copy
+
+import rml_parse
 from report import report_sxw
-import pdb
-import re
 
 class tax_report(rml_parse.rml_parse):
 	_name = 'report.account.vat.declaration'
-	def __init__(self, cr, uid, name, context):
+	def __init__(self, cr, uid, name, context={}):
+		print "tax______init", name, context
 		super(tax_report, self).__init__(cr, uid, name, context=context)
 		self.localcontext.update({
 			'time': time,
@@ -42,19 +41,19 @@ class tax_report(rml_parse.rml_parse):
 		})
 
 
-	def _get_lines(self, based_on,period_list,company_id=False, parent=False, level=0):
-		res = self._get_codes(based_on,company_id,parent,level,period_list)
+	def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
+		res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
 
-		if period_list[0][2] :
-			res = self._add_codes(based_on,res,period_list)
+		if period_list:
+			res = self._add_codes(based_on, res, period_list, context=context)
 		else :
 			self.cr.execute ("select id from account_fiscalyear")
 			fy = self.cr.fetchall()
 			self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
 			periods = self.cr.fetchall()
 			for p in periods :
-				period_list[0][2].append(p[0])
-			res = self._add_codes(based_on,res,period_list)
+				period_list.append(p[0])
+			res = self._add_codes(based_on, res, period_list, context=context)
 
 		i = 0
 		top_result = []
@@ -71,7 +70,7 @@ class tax_report(rml_parse.rml_parse):
 			}
 
 			top_result.append(res_dict)
-			res_general = self._get_general(res[i][1].id,period_list,company_id,based_on)
+			res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context)
 			ind_general = 0
 			while ind_general < len(res_general) :
 				res_general[ind_general]['type'] = 2
@@ -84,11 +83,12 @@ class tax_report(rml_parse.rml_parse):
 		return top_result
 		#return array_result
 
-	def _get_period(self, period_id):
-		return self.pool.get('account.period').browse(self.cr, self.uid, period_id).name
+	def _get_period(self, period_id, context={}):
+		return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name
 
-	def _get_general(self, tax_code_id,period_list ,company_id, based_on):
+	def _get_general(self, tax_code_id,period_list ,company_id, based_on, context={}):
 		res=[]
+		obj_account = self.pool.get('account.account')
 		if based_on == 'payments':
 			self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
 						SUM(line.debit) AS debit, \
@@ -110,8 +110,8 @@ class tax_report(rml_parse.rml_parse):
 						AND line.period_id =ANY(%s) \
 						AND ((invoice.state = %s) \
 							OR (invoice.id IS NULL))  \
-					GROUP BY account.id,account.name,account.code', ('draft',tax_code_id,
-						company_id, period_list[0][2],'paid',))
+					GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
+						company_id, period_list, 'paid',))
 
 		else :
 			self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
@@ -129,52 +129,54 @@ class tax_report(rml_parse.rml_parse):
 						AND account.company_id = %s \
 						AND line.period_id =ANY(%s)\
 						AND account.active \
-					GROUP BY account.id,account.name,account.code', ('draft',tax_code_id,
-						company_id,period_list[0][2],))
+					GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
+						company_id, period_list,))
 		res = self.cr.dictfetchall()
 
 						#AND line.period_id IN ('+ period_sql_list +') \
 
 		i = 0
 		while i<len(res):
-			res[i]['account'] = self.pool.get('account.account').browse(self.cr, self.uid, res[i]['account_id'])
+			res[i]['account'] = obj_account.browse(self.cr, self.uid, res[i]['account_id'], context=context)
 			i+=1
 		return res
 
-	def _get_codes(self,based_on, company_id, parent=False, level=0,period_list=[]):
-		tc = self.pool.get('account.tax.code')
-		ids = tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)])
+	def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context={}):
+		obj_tc = self.pool.get('account.tax.code')
+		ids = obj_tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)], context=context)
 
 		res = []
-		for code in tc.browse(self.cr, self.uid, ids, {'based_on': based_on}):
-			res.append(('.'*2*level,code))
+		for code in obj_tc.browse(self.cr, self.uid, ids, {'based_on': based_on}):
+			res.append(('.'*2*level, code))
 
-			res += self._get_codes(based_on, company_id, code.id, level+1)
+			res += self._get_codes(based_on, company_id, code.id, level+1, context=context)
 		return res
 
-	def _add_codes(self,based_on, account_list=[],period_list=[]):
+	def _add_codes(self, based_on, account_list=[], period_list=[], context={}):
 		res = []
+		obj_tc = self.pool.get('account.tax.code')
 		for account in account_list:
-			tc = self.pool.get('account.tax.code')
-			ids = tc.search(self.cr, self.uid, [('id','=',account[1].id)])
+			ids = obj_tc.search(self.cr, self.uid, [('id','=', account[1].id)], context=context)
 			sum_tax_add = 0
-			for period_ind in period_list[0][2]:
-				for code in tc.browse(self.cr, self.uid, ids, {'period_id':period_ind,'based_on': based_on}):
+			for period_ind in period_list:
+				for code in obj_tc.browse(self.cr, self.uid, ids, {'period_id':period_ind,'based_on': based_on}):
 					sum_tax_add = sum_tax_add + code.sum_period
 
 			code.sum_period = sum_tax_add
 
-			res.append((account[0],code))
+			res.append((account[0], code))
 		return res
 
 
-	def _get_company(self, form):
-		return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).name
+	def _get_company(self, form, context={}):
+		obj_company = self.pool.get('res.company')
+		return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).name
 
-	def _get_currency(self, form):
-		return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).currency_id.name
+	def _get_currency(self, form, context={}):
+		obj_company = self.pool.get('res.company')
+		return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name
 
-	def sort_result(self,accounts):
+	def sort_result(self, accounts, context={}):
 		# On boucle sur notre rapport
 		result_accounts = []
 		ind=0
@@ -191,7 +193,7 @@ class tax_report(rml_parse.rml_parse):
 				bcl_rup_ind = ind - 1
 
 				while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
-					tot_elem = copy.copy(accounts[bcl_rup_ind])
+					tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
 					res_tot = { 'code' : accounts[bcl_rup_ind]['code'],
 						'name' : '',
 						'debit' : 0,
@@ -218,6 +220,6 @@ class tax_report(rml_parse.rml_parse):
 
 
 report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code',
-	'addons/account/report/tax_report.rml', parser=tax_report, header=False)
+	'addons/account/report/tax_report.rml', parser=tax_report, header=True)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/sequence_view.xml b/addons/account/sequence_view.xml
index a2766af1ffa..2d4d159cb41 100644
--- a/addons/account/sequence_view.xml
+++ b/addons/account/sequence_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.sequence_view"/>
             <field name="arch" type="xml">
                 <page position="after">
-                    <page string="Fiscal Years">
+                    <page string="Fiscal Years" groups="base.group_extended">
                         <field name="fiscal_ids" nolabel="1" colspan="4">
                             <tree string="Fiscal Year Sequences" editable="bottom">
                                 <field name="fiscalyear_id"/>
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index f3a05ebe184..e9ca2487604 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -23,11 +23,11 @@ import wizard_automatic_reconcile
 import account_move_line_reconcile_select
 import account_move_line_unreconcile_select
 import wizard_reconcile
-import wizard_unreconcile
+import account_unreconcile
 import account_invoice_refund
-import wizard_pay_invoice
+import account_pay_invoice
 import account_move_journal
-import wizard_journal_select
+import account_journal_select
 import account_move_bank_reconcile
 import account_subscription_generate
 import wizard_aged_trial_balance
@@ -36,27 +36,27 @@ import wizard_third_party_ledger
 import wizard_account_balance_report
 import wizard_partner_balance_report
 import account_period_close
-import wizard_fiscalyear_close
+import account_fiscalyear_close
 import account_fiscalyear_close_state
-import wizard_open_closed_fiscalyear
+import account_vat
+import account_open_closed_fiscalyear
 
-import wizard_vat
 import wizard_compare_account_balance_report
-import wizard_invoice_state
+import account_invoice_state
 import wizard_account_duplicate
 import account_chart
 import wizard_move_line_select
 
-import wizard_validate_account_move
+import account_validate_account_move
 import wizard_use_model
 
-import wizard_state_open
+import account_state_open
 
-import wizard_statement_from_invoice
-import wizard_print_journal
-import wizard_central_journal
-import wizard_general_journal
-import wizard_change_currency
+import account_statement_from_invoice
+import account_print_journal
+import account_central_journal
+import account_general_journal
+import account_change_currency
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/wizard/account_central_journal.py b/addons/account/wizard/account_central_journal.py
new file mode 100644
index 00000000000..08fe881c81a
--- /dev/null
+++ b/addons/account/wizard/account_central_journal.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class account_central_journal(osv.osv_memory):
+    _name = 'account.central.journal'
+    _description = 'Account Central Journal'
+
+    _columns = {
+        'journal_id': fields.many2many('account.journal', 'account_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
+        'period_id': fields.many2many('account.period', 'account_period_rel', 'account_id', 'period_id', 'Periods',  required=True),
+        }
+
+    def check_data(self, cr, uid, ids, context={}):
+        obj_jperiod = self.pool.get('account.journal.period')
+        datas = {}
+        datas['ids'] = []
+        datas['model'] = 'account.journal.period'
+        datas['form'] = self.read(cr, uid, ids)[0]
+        period_id = datas['form']['period_id']
+        journal_id = datas['form']['journal_id']
+
+        if type(period_id)==type([]):
+            ids_final = []
+            for journal in journal_id:
+                for period in period_id:
+                    ids_journal_period = obj_jperiod.search(cr,uid, [('journal_id','=',journal),('period_id','=',period)], context=context)
+                    if ids_journal_period:
+                        ids_final.append(ids_journal_period)
+                if not ids_final:
+                    raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account.central.journal',
+            'datas': datas,
+            }
+
+account_central_journal()
+
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+
diff --git a/addons/account/wizard/account_central_journal_view.xml b/addons/account/wizard/account_central_journal_view.xml
new file mode 100644
index 00000000000..ec3f0eabb5d
--- /dev/null
+++ b/addons/account/wizard/account_central_journal_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="view_account_central_journal" model="ir.ui.view">
+            <field name="name">Account central Journal</field>
+            <field name="model">account.central.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Print Central Journal">
+			    <group col="4" colspan="6">
+				    <field name="journal_id"/>
+				    <field name="period_id"/>
+				</group>
+				<separator colspan="4"/>
+			    <group col="2" colspan="4">
+	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+				</group>
+			</form>
+            </field>
+        </record>
+
+        <record id="action_account_central_journal" model="ir.actions.act_window">
+            <field name="name">Account Central Journal</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.central.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+		<menuitem
+	        name="Print Central Journal"
+	        parent="account.menu_generic_report"
+	        action="action_account_central_journal"
+	        id="menu_account_central_journal"
+	        icon="STOCK_PRINT"/>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
new file mode 100644
index 00000000000..707a182a2aa
--- /dev/null
+++ b/addons/account/wizard/account_change_currency.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import osv, fields
+from tools.translate import _
+
+class account_change_currency(osv.osv_memory):
+    _name = 'account.change.currency'
+    _description = 'Change Currency'
+    _columns = {
+       'currency_id': fields.many2one('res.currency', 'New Currency', required=True),
+              }
+
+    def view_init(self, cr , uid , fields_list, context=None):
+        obj_inv = self.pool.get('account.invoice')
+        if context is None:
+            context = {}
+        state = obj_inv.browse(cr, uid, context['active_id']).state
+        if obj_inv.browse(cr, uid, context['active_id']).state != 'draft':
+            raise osv.except_osv(_('Error'), _('You can not change currency for Open Invoice !'))
+        pass
+
+    def change_currency(self, cr, uid, ids, context=None):
+        obj_inv = self.pool.get('account.invoice')
+        obj_inv_line = self.pool.get('account.invoice.line')
+        obj_currency = self.pool.get('res.currency')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids)[0]
+        new_currency = data['currency_id']
+
+        for invoice in obj_inv.browse(cr, uid, context['active_ids'], context=context):
+            if invoice.currency_id.id == new_currency:
+                continue
+
+            for line in invoice.invoice_line:
+                rate = obj_currency.browse(cr, uid, new_currency).rate
+                new_price = 0
+                if invoice.company_id.currency_id.id == invoice.currency_id.id:
+                    new_price = line.price_unit * rate
+
+                if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id == new_currency:
+                    old_rate = invoice.currency_id.rate
+                    new_price = line.price_unit / old_rate
+
+                if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id != new_currency:
+                    old_rate = invoice.currency_id.rate
+                    new_price = (line.price_unit / old_rate ) * rate
+
+                obj_inv_line.write(cr, uid, [line.id], {'price_unit' : new_price})
+            obj_inv.write(cr, uid, [invoice.id], {'currency_id' : new_currency})
+        return {}
+
+account_change_currency()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
new file mode 100644
index 00000000000..33b351bb85c
--- /dev/null
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_account_change_currency" model="ir.ui.view">
+            <field name="name">Change Currency</field>
+            <field name="model">account.change.currency</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Invoice Currency">
+				    <field name="currency_id"/>
+				    <separator colspan="4"/>
+              		<group colspan="2" col="4">
+            			<button special="cancel" string="Cancel"  icon="gtk-cancel"/>
+            			<button name="change_currency" string="Change Currency" type="object" icon="gtk-go-forward"/>
+                	</group>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_account_change_currency" model="ir.actions.act_window">
+            <field name="name">Change Currency</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.change.currency</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_account_change_currency"/>
+	        <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+    	<record model="ir.values" id="account_change_currency">
+            <field name="model_id" ref="account.model_account_invoice" />
+            <field name="object" eval="1" />
+            <field name="name">Change Currency</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_change_currency'))"/>
+            <field name="key">action</field>
+            <field name="model">account.invoice</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index 7def37807c3..38f47114490 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -21,7 +21,6 @@
 
 from osv import fields, osv
 from tools.translate import _
-import tools
 
 class account_chart(osv.osv_memory):
     """
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
new file mode 100644
index 00000000000..c71c85ea4a3
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -0,0 +1,228 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_fiscalyear_close(osv.osv_memory):
+    """
+    Closes Account Fiscalyear and Generate Opening entries for New Fiscalyear
+    """
+    _name = "account.fiscalyear.close"
+    _description = "Fiscalyear Close"
+    _columns = {
+       'fy_id': fields.many2one('account.fiscalyear', \
+                                 'Fiscal Year to close', required=True),
+       'fy2_id': fields.many2one('account.fiscalyear', \
+                                 'New Fiscal Year', required=True),
+       'journal_id': fields.many2one('account.journal', \
+                                 'Opening Entries Journal', required=True),
+       'period_id': fields.many2one('account.period', \
+                                 'Opening Entries Period', required=True),
+       'report_name': fields.char('Name of new entries',size=64, required=True),
+       'sure': fields.boolean('Check this box'),
+              }
+    _defaults = {
+        'report_name':'End of Fiscal Year Entry',
+        }
+
+    def data_save(self, cr, uid, ids, context=None):
+        """
+        This function close account fiscalyear and create entries in new fiscalyear
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Account fiscalyear close state’s IDs
+
+        """
+        obj_acc_period = self.pool.get('account.period')
+        obj_acc_fiscalyear = self.pool.get('account.fiscalyear')
+        obj_acc_journal = self.pool.get('account.journal')
+        obj_acc_move_line = self.pool.get('account.move.line')
+        obj_acc_account = self.pool.get('account.account')
+        obj_acc_journal_period = self.pool.get('account.journal.period')
+
+        data =  self.read(cr, uid, ids, context=context)
+
+        if context is None:
+            context = {}
+        if not data[0]['sure']:
+            raise osv.except_osv(_('UserError'), _('Closing of fiscal year cancelled, please check the box !'))
+        fy_id = data[0]['fy_id']
+
+
+        period_ids = obj_acc_period.search(cr, uid, [('fiscalyear_id', '=', fy_id)])
+        periods_fy2 = obj_acc_period.search(cr, uid, [('fiscalyear_id', '=', data[0]['fy2_id'])])
+
+        period = obj_acc_period.browse(cr, uid, data[0]['period_id'], context=context)
+        new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy2_id'], context=context)
+        old_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy_id'], context=context)
+
+        new_journal = data[0]['journal_id']
+        new_journal = obj_acc_journal.browse(cr, uid, new_journal, context=context)
+
+        if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
+            raise osv.except_osv(_('UserError'),
+                    _('The journal must have default credit and debit account'))
+        if not new_journal.centralisation:
+            raise osv.except_osv(_('UserError'),
+                    _('The journal must have centralised counterpart'))
+
+        move_ids = obj_acc_move_line.search(cr, uid, [
+            ('journal_id','=',new_journal.id),('period_id.fiscalyear_id','=',new_fyear.id)])
+        if move_ids:
+            raise osv.except_osv(_('UserError'),
+                    _('The opening journal must not have any entry in the new fiscal year !'))
+        query = "SELECT id FROM account_fiscalyear WHERE date_stop < '" + str(new_fyear.date_start) + "'"
+        cr.execute(query)
+        result = cr.dictfetchall()
+        fy_ids = ','.join([str(x['id']) for x in result])
+        query_line = obj_acc_move_line._query_get(cr, uid,
+                obj='account_move_line', context={'fiscalyear': fy_ids})
+        cr.execute('select id from account_account WHERE active')
+        ids = map(lambda x: x[0], cr.fetchall())
+        for account in obj_acc_account.browse(cr, uid, ids,
+            context={'fiscalyear': fy_id}):
+
+            accnt_type_data = account.user_type
+            if not accnt_type_data:
+                continue
+            if accnt_type_data.close_method=='none' or account.type == 'view':
+                continue
+            if accnt_type_data.close_method=='balance':
+                if abs(account.balance)>0.0001:
+                    obj_acc_move_line.create(cr, uid, {
+                        'debit': account.balance>0 and account.balance,
+                        'credit': account.balance<0 and -account.balance,
+                        'name': data[0]['report_name'],
+                        'date': period.date_start,
+                        'journal_id': new_journal.id,
+                        'period_id': period.id,
+                        'account_id': account.id
+                    }, {'journal_id': new_journal.id, 'period_id':period.id})
+            if accnt_type_data.close_method == 'unreconciled':
+                offset = 0
+                limit = 100
+                while True:
+                    cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
+                                'amount_currency, currency_id, blocked, partner_id, ' \
+                                'date_maturity, date_created ' \
+                            'FROM account_move_line ' \
+                            'WHERE account_id = %s ' \
+                                'AND ' + query_line + ' ' \
+                                'AND reconcile_id is NULL ' \
+                            'ORDER BY id ' \
+                            'LIMIT %s OFFSET %s', (account.id, limit, offset))
+                    result = cr.dictfetchall()
+                    if not result:
+                        break
+                    for move in result:
+                        move.pop('id')
+                        move.update({
+                            'date': period.date_start,
+                            'journal_id': new_journal.id,
+                            'period_id': period.id,
+                        })
+                        obj_acc_move_line.create(cr, uid, move, {
+                            'journal_id': new_journal.id,
+                            'period_id': period.id,
+                            })
+                    offset += limit
+
+                #We have also to consider all move_lines that were reconciled
+                #on another fiscal year, and report them too
+                offset = 0
+                limit = 100
+                while True:
+                    #TODO: this query could be improved in order to work if there is more than 2 open FY
+                    # a.period_id IN ('+fy2_period_set+') is the problematic clause
+                    cr.execute('SELECT b.id, b.name, b.quantity, b.debit, b.credit, b.account_id, b.ref, ' \
+                                'b.amount_currency, b.currency_id, b.blocked, b.partner_id, ' \
+                                'b.date_maturity, b.date_created ' \
+                            'FROM account_move_line a, account_move_line b ' \
+                            'WHERE b.account_id = %s ' \
+                                'AND b.reconcile_id is NOT NULL ' \
+                                'AND a.reconcile_id = b.reconcile_id ' \
+                                'AND b.period_id =ANY(%s)'\
+                                'AND a.period_id =ANY(%s)' \
+                            'ORDER BY id ' \
+                            'LIMIT %s OFFSET %s', (account.id,period_ids,periods_fy2,limit, offset))
+                    result = cr.dictfetchall()
+                    if not result:
+                        break
+                    for move in result:
+                        move.pop('id')
+                        move.update({
+                            'date': period.date_start,
+                            'journal_id': new_journal.id,
+                            'period_id': period.id,
+                        })
+                        obj_acc_move_line.create(cr, uid, move, {
+                            'journal_id': new_journal.id,
+                            'period_id': period.id,
+                            })
+                    offset += limit
+            if accnt_type_data.close_method=='detail':
+                offset = 0
+                limit = 100
+                while True:
+                    cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
+                                'amount_currency, currency_id, blocked, partner_id, ' \
+                                'date_maturity, date_created ' \
+                            'FROM account_move_line ' \
+                            'WHERE account_id = %s ' \
+                                'AND ' + query_line + ' ' \
+                            'ORDER BY id ' \
+                            'LIMIT %s OFFSET %s', (account.id, limit, offset))
+
+                    result = cr.dictfetchall()
+                    if not result:
+                        break
+                    for move in result:
+                        move.pop('id')
+                        move.update({
+                            'date': period.date_start,
+                            'journal_id': new_journal.id,
+                            'period_id': period.id,
+                        })
+                        obj_acc_move_line.create(cr, uid, move)
+                    offset += limit
+        ids = obj_acc_move_line.search(cr, uid, [('journal_id','=',new_journal.id),
+            ('period_id.fiscalyear_id','=',new_fyear.id)])
+        context['fy_closing'] = True
+
+        if ids:
+            obj_acc_move_line.reconcile(cr, uid, ids, context=context)
+        new_period = data[0]['period_id']
+        ids = obj_acc_journal_period.search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)])
+        if not ids:
+            ids = [obj_acc_journal_period.create(cr, uid, {
+                   'name': (new_journal.name or '')+':'+(period.code or ''),
+                   'journal_id': new_journal.id,
+                   'period_id': period.id
+               })]
+        cr.execute('UPDATE account_fiscalyear ' \
+                    'SET end_journal_period_id = %s ' \
+                    'WHERE id = %s', (ids[0], old_fyear.id))
+        return {}
+
+account_fiscalyear_close()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
new file mode 100644
index 00000000000..e8db5193275
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_fiscalyear_close" model="ir.ui.view">
+            <field name="name">account.fiscalyear.close.form</field>
+            <field name="model">account.fiscalyear.close</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Generate Fiscal Year Opening Entries Close a Fiscal Year with new entries">
+                	<group colspan="4" >
+	                	<field name="fy_id"  domain = "[('state','=','draft')]"/>
+	                	<field name="fy2_id"  domain = "[('state','=','draft')]"/>
+	                	<field name="journal_id" />
+	                	<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
+                	</group>
+                	<group colspan="4" >
+                		<field name="report_name" />
+                	</group>
+                	<group colspan="4" >
+              			 <separator string="Are you sure you want to create entries?" colspan="4"/>
+                		 <field name="sure"/>
+                    </group>
+                  	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_account_fiscalyear_close" model="ir.actions.act_window">
+            <field name="name">Generate Fiscal Year Opening Entries</field>
+            <field name="res_model">account.fiscalyear.close</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_fiscalyear_close"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_account_fiscalyear_close"
+        	id="menu_wizard_fy_close"
+        	parent="menu_account_end_year_treatments" />
+
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_general_journal.py b/addons/account/wizard/account_general_journal.py
new file mode 100644
index 00000000000..56ad7375acf
--- /dev/null
+++ b/addons/account/wizard/account_general_journal.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class account_general_journal(osv.osv_memory):
+    _name = 'account.general.journal'
+    _description = 'Account General Journal'
+
+    _columns = {
+        'journal_id': fields.many2many('account.journal', 'account_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
+        'period_id': fields.many2many('account.period', 'account_period_rel', 'account_id', 'period_id', 'Periods',  required=True),
+        }
+
+    def check_data(self, cr, uid, ids, context={}):
+        obj_jperiod = self.pool.get('account.journal.period')
+        datas = {}
+        datas['ids'] = []
+        datas['model'] = 'account.journal.period'
+        datas['form'] = self.read(cr, uid, ids)[0]
+        period_id = datas['form']['period_id']
+        journal_id = datas['form']['journal_id']
+
+        if type(period_id)==type([]):
+            ids_final = []
+            for journal in journal_id:
+                for period in period_id:
+                    ids_journal_period = obj_jperiod.search(cr,uid, [('journal_id','=',journal),('period_id','=',period)], context=context)
+                    if ids_journal_period:
+                        ids_final.append(ids_journal_period)
+                if not ids_final:
+                    raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account.general.journal',
+            'datas': datas,
+            }
+
+account_general_journal()
+
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_general_journal_view.xml b/addons/account/wizard/account_general_journal_view.xml
new file mode 100644
index 00000000000..425efbaf847
--- /dev/null
+++ b/addons/account/wizard/account_general_journal_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="view_account_general_journal" model="ir.ui.view">
+            <field name="name">Account Genral Journal</field>
+            <field name="model">account.general.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Print General Journal">
+			    <group col="4" colspan="6">
+				    <field name="journal_id"/>
+				    <field name="period_id"/>
+				</group>
+				<separator colspan="4"/>
+			    <group col="2" colspan="4">
+	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+				</group>
+			</form>
+            </field>
+        </record>
+
+        <record id="action_account_general_journal" model="ir.actions.act_window">
+            <field name="name">Account General Journal</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.general.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+		<menuitem
+	        name="Print General Journal"
+	        parent="account.menu_generic_report"
+	        action="action_account_general_journal"
+	        id="menu_account_general_journal"
+	        icon="STOCK_PRINT"/>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index cc69311b2f7..1942fd56e60 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -18,13 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 from osv import fields, osv
 from tools.translate import _
-import tools
 import netsvc
 
-
 class account_invoice_refund(osv.osv_memory):
 
     """Refunds invoice."""
diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
new file mode 100644
index 00000000000..6b1a41f49af
--- /dev/null
+++ b/addons/account/wizard/account_invoice_state.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+
+class account_invoice_confirm(osv.osv_memory):
+    """
+    This wizard will confirm the all the selected draft invoices
+    """
+
+    _name = "account.invoice.confirm"
+    _description = "Confirm the selected invoices"
+
+    def invoice_confirm(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService('workflow')
+        if context is None:
+            context = {}
+        for id in context['active_ids']:
+            wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_open', cr)
+        return {}
+
+account_invoice_confirm()
+
+class account_invoice_cancel(osv.osv_memory):
+    """
+    This wizard will cancel the all the selected invoices.
+    If in the journal, the option allow cancelling entry is not selected then it will give warning message.
+    """
+
+    _name = "account.invoice.cancel"
+    _description = "Cancel the selected invoices"
+
+    def invoice_cancel(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService('workflow')
+        if context is None:
+            context = {}
+        for id in context['active_ids']:
+            wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
+        return {}
+
+account_invoice_cancel()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
new file mode 100644
index 00000000000..8748edbb688
--- /dev/null
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -0,0 +1,73 @@
+<openerp>
+    <data>
+
+		<record id="account_invoice_confirm_view" model="ir.ui.view">
+            <field name="name">account.invoice.confirm.form</field>
+            <field name="model">account.invoice.confirm</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Confirm draft invoices">
+			    <separator string="Confirm draft invoices" colspan="4"/>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
+                   </group>
+               </form>
+            </field>
+    	</record>
+
+		<record id="action_account_invoice_confirm" model="ir.actions.act_window">
+            <field name="name">Confirm draft invoices</field>
+            <field name="res_model">account.invoice.confirm</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           <field name="view_id" ref="account_invoice_confirm_view"/>
+           <field name="target">new</field>
+        </record>
+
+		<record model="ir.values" id="action_account_invoice_confirm_values">
+            <field name="model_id" ref="account.model_account_invoice" />
+            <field name="object" eval="1" />
+            <field name="name">Confirm draft invoices</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />
+            <field name="key">action</field>
+            <field name="model">account.invoice</field>
+		</record>
+
+		<record id="account_invoice_cancel_view" model="ir.ui.view">
+            <field name="name">account.invoice.cancel.form</field>
+            <field name="model">account.invoice.cancel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Cancel selected invoices">
+			    <separator string="Cancel selected invoices" colspan="4"/>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Cancel selected invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                   </group>
+               </form>
+            </field>
+    	</record>
+
+		<record id="action_account_invoice_cancel" model="ir.actions.act_window">
+            <field name="name">Cancel selected invoices</field>
+            <field name="res_model">account.invoice.cancel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           <field name="view_id" ref="account_invoice_cancel_view"/>
+           <field name="target">new</field>
+        </record>
+
+		<record model="ir.values" id="action_account_invoice_cancel_values">
+            <field name="model_id" ref="account.model_account_invoice" />
+            <field name="object" eval="1" />
+            <field name="name">Cancel selected invoices</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />
+            <field name="key">action</field>
+            <field name="model">account.invoice</field>
+		</record>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_journal_select.py b/addons/account/wizard/account_journal_select.py
new file mode 100644
index 00000000000..f13958ed90f
--- /dev/null
+++ b/addons/account/wizard/account_journal_select.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class account_journal_select(osv.osv_memory):
+    """
+        Account Journal Select
+    """
+    _name = "account.journal.select"
+    _description = "Account Journal Select"
+
+    def action_open_window(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        if context is None:
+            context = {}
+
+        result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_select')
+        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        result = act_obj.read(cr, uid, [id])[0]
+        cr.execute('select journal_id, period_id from account_journal_period where id=%s', (context['active_id'],))
+        journal_id, period_id = cr.fetchone()
+
+        result['domain'] = str([('journal_id', '=', journal_id), ('period_id', '=', period_id)])
+        result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
+        return result
+
+
+account_journal_select()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
new file mode 100644
index 00000000000..71a0d591768
--- /dev/null
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="open_journal_button_view" model="ir.ui.view">
+            <field name="name">Open Journal Button</field>
+            <field name="model">account.journal.select</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Journal Select">
+                		<label string="Are you sure you want to open Journal Entries!" colspan="4"/>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-open" string="Open Entries" name="action_open_window" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+        <record id="action_open_journal_button" model="ir.actions.act_window">
+            <field name="name">Open Journal</field>
+            <field name="res_model">account.journal.select</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           <field name="view_id" ref="open_journal_button_view"/>
+           <field name="target">new</field>
+        </record>
+
+        <record id="ir_open_journal_period" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">account.journal.period</field>
+            <field name="name">Open Journal</field>
+            <field eval="'ir.actions.act_window,%d'%action_open_journal_button" name="value"/>
+            <field eval="True" name="object"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
index db0ddb10108..d089db01f5e 100644
--- a/addons/account/wizard/account_move_line_reconcile_select.py
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -18,11 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 from osv import fields, osv
 from tools.translate import _
-import tools
-
 
 class account_move_line_reconcile_select(osv.osv_memory):
     _name = "account.move.line.reconcile.select"
@@ -41,17 +38,16 @@ class account_move_line_reconcile_select(osv.osv_memory):
         @return: dictionary of  Open  account move line window for reconcile on given account id
 
          """
-        for data in  self.read(cr, uid, ids,context=context):
-
-            return {
-                'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['account_id'],
-                'name': _('Reconciliation'),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'view_id': False,
-                'res_model': 'account.move.line',
-                'type': 'ir.actions.act_window'
-                }
+        data = self.read(cr, uid, ids, context=context)[0]
+        return {
+            'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['account_id'],
+            'name': _('Reconciliation'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'view_id': False,
+            'res_model': 'account.move.line',
+            'type': 'ir.actions.act_window'
+            }
 
 account_move_line_reconcile_select()
 
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index f7fcccddc4c..ae7f9567748 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -15,7 +15,7 @@
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel" />
 						<button icon="gtk-open"
-							string="Open for reconciliation" name="action_open_window"
+							string="Open for Reconciliation" name="action_open_window"
 							type="object" />
                    </group>
                </form>
@@ -23,7 +23,7 @@
     	</record>
 
         <record id="action_account_reconcile_select" model="ir.actions.act_window">
-            <field name="name">Reconcile entries</field>
+            <field name="name">Reconcile Entries</field>
             <field name="res_model">account.move.line.reconcile.select</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select.py b/addons/account/wizard/account_move_line_unreconcile_select.py
index 07fd0017742..1c44e8548bd 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select.py
+++ b/addons/account/wizard/account_move_line_unreconcile_select.py
@@ -30,20 +30,19 @@ class account_move_line_unreconcile_select(osv.osv_memory):
     _description = "Unreconciliation"
     _columns ={
        'account_id': fields.many2one('account.account','Account',required=True),
-
                }
 
     def action_open_window(self, cr, uid, ids, context={}):
-             for data in self.read(cr, uid, ids):
-                 return {
-                    'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data['account_id'],
-                    'name': 'Unreconciliation',
-                    'view_type': 'form',
-                    'view_mode': 'tree,form',
-                    'view_id': False,
-                    'res_model': 'account.move.line',
-                    'type': 'ir.actions.act_window'
-                }
+        data = self.read(cr, uid, ids, context=context)[0]
+        return {
+                'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data['account_id'],
+                'name': 'Unreconciliation',
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'view_id': False,
+                'res_model': 'account.move.line',
+                'type': 'ir.actions.act_window'
+            }
 
 account_move_line_unreconcile_select()
 
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 06c0a0d1e0e..7d10c02f010 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -15,7 +15,7 @@
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel" />
 						<button icon="gtk-open"
-							string="Open for Unreconciliation" name="action_open_window"
+							string="Open For Unreconciliation" name="action_open_window"
 							type="object" />
                    </group>
                </form>
@@ -23,7 +23,7 @@
     	</record>
 
         <record id="action_account_unreconcile_select" model="ir.actions.act_window">
-            <field name="name">Unreconcile entries</field>
+            <field name="name">Unreconcile Entries</field>
             <field name="res_model">account.move.line.unreconcile.select</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
new file mode 100644
index 00000000000..b4f0f12b4b8
--- /dev/null
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class account_open_closed_fiscalyear(osv.osv_memory):
+
+    _name = "account.open.closed.fiscalyear"
+    _description = "Choose Fiscal Year"
+    _columns = {
+       'fyear_id': fields.many2one('account.fiscalyear', \
+                                 'Fiscal Year to Open', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
+              }
+
+    def remove_entries(self, cr, uid, ids, context={}):
+        data = self.read(cr, uid, ids, [])[0]
+        data_fyear = self.pool.get('account.fiscalyear').browse(cr, uid, data['fyear_id'])
+        if not data_fyear.end_journal_period_id:
+            raise osv.except_osv(_('Error'), _('No journal for ending writing has been defined for the fiscal year'))
+        period_journal = data_fyear.end_journal_period_id
+        ids_move = self.pool.get('account.move').search(cr,uid,[('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
+        if ids_move:
+            cr.execute('delete from account_move where id =ANY(%s)',(ids_move,))
+                    #cr.execute('UPDATE account_journal_period ' \
+            #        'SET state = %s ' \
+            #        'WHERE period_id IN (SELECT id FROM account_period WHERE fiscalyear_id = %s)',
+            #        ('draft',data_fyear))
+            #cr.execute('UPDATE account_period SET state = %s ' \
+            #        'WHERE fiscalyear_id = %s', ('draft',data_fyear))
+            #cr.execute('UPDATE account_fiscalyear ' \
+            #        'SET state = %s, end_journal_period_id = null '\
+            #        'WHERE id = %s', ('draft',data_fyear))
+        return {}
+
+account_open_closed_fiscalyear()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
new file mode 100644
index 00000000000..c5269939e0c
--- /dev/null
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_open_closed_fiscalyear" model="ir.ui.view">
+            <field name="name">account.open.closed.fiscalyear.form</field>
+            <field name="model">account.open.closed.fiscalyear</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Choose Fiscal Year ">
+                	<group colspan="4" >
+                		 <field name="fyear_id"  domain = "[('state','=','draft')]"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-open" string="Open" name="remove_entries" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_account_open_closed_fiscalyear" model="ir.actions.act_window">
+            <field name="name">Cancel Opening Entries</field>
+            <field name="res_model">account.open.closed.fiscalyear</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_open_closed_fiscalyear"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_account_open_closed_fiscalyear"
+        	id="menu_wizard_open_closed_fy"  sequence="2"
+        	parent="account.menu_account_end_year_treatments" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_pay_invoice.py b/addons/account/wizard/account_pay_invoice.py
new file mode 100644
index 00000000000..0b71055409f
--- /dev/null
+++ b/addons/account/wizard/account_pay_invoice.py
@@ -0,0 +1,191 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+from tools.translate import _
+import decimal_precision as dp
+
+class account_invoice_pay_writeoff(osv.osv_memory):
+    """
+    Opens the write off amount pay form.
+    """
+    _name = "account.invoice.pay.writeoff"
+    _description = "Pay Invoice  "
+    _columns = {
+        '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'),
+        }
+    _defaults = {
+        'comment': 'Write-Off',
+        }
+
+    def pay_and_reconcile_writeoff(self, cr, uid, ids, context=None):
+        data =  self.read(cr, uid, ids,context=context)[0]
+        context.update({'write_off':data})
+        self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context)
+        return {}
+
+account_invoice_pay_writeoff()
+
+class account_invoice_pay(osv.osv_memory):
+    """
+    Generate pay invoice wizard, user can make partial or full payment for invoice.
+    """
+    _name = "account.invoice.pay"
+    _description = "Pay Invoice  "
+    _columns = {
+        'amount': fields.float('Amount paid', required=True, digits_compute = dp.get_precision('Account')),
+        'name': fields.char('Entry Name', size=64, required=True),
+        'date': fields.date('Date payment', required=True),
+        'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True),
+        'period_id': fields.many2one('account.period', 'Period', required=True),
+        }
+
+    def view_init(self, cr, uid, ids, context=None):
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context)
+        if invoice.state in ['draft', 'proforma2', 'cancel']:
+            raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
+        pass
+
+    def _get_period(self, cr, uid, context=None):
+        ids = self.pool.get('account.period').find(cr, uid, context=context)
+        period_id = False
+        if len(ids):
+            period_id = ids[0]
+        return period_id
+
+    def _get_amount(self, cr, uid, context=None):
+        return self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context).residual
+
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'period_id': _get_period,
+        'amount': _get_amount,
+        }
+
+    def wo_check(self, cr, uid, ids, context=None):
+        cur_obj = self.pool.get('res.currency')
+        mod_obj = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
+        data =  self.read(cr, uid, ids,context=context)[0]
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context)
+        journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context)
+
+       # Here we need that:
+        #    The invoice total amount in company's currency <> paid amount in company currency
+        #    (according to the correct day rate, invoicing rate and payment rate are may be different)
+        #    => Ask to a write-off of the difference. This could happen even if both amount are equal,
+        #    because if the currency rate
+        # Get the amount in company currency for the invoice (according to move lines)
+        inv_amount_company_currency = 0
+        for aml in invoice.move_id.line_id:
+            if aml.account_id.id == invoice.account_id.id or aml.account_id.type in ('receivable', 'payable'):
+                inv_amount_company_currency += aml.debit
+                inv_amount_company_currency -= aml.credit
+        inv_amount_company_currency = abs(inv_amount_company_currency)
+
+        # Get the current amount paid in company currency
+        if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
+            ctx = {'date':data['date']}
+            amount_paid = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, data['amount'], round=True, context=ctx)
+        else:
+            amount_paid = data['amount']
+        # Get the old payment if there are some
+        if invoice.payment_ids:
+            debit=credit=0.0
+            for payment in invoice.payment_ids:
+                debit+=payment.debit
+                credit+=payment.credit
+            amount_paid+=abs(debit-credit)
+
+        # Test if there is a difference according to currency rouding setting
+        if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
+                (amount_paid - inv_amount_company_currency)):
+            return self.pay_and_reconcile(cr, uid, ids, context=context)
+        else:
+            model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_account_invoice_pay_writeoff')], context=context)
+            resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            return {
+                'name': _('Information addendum'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'account.invoice.pay.writeoff',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }
+
+    def pay_and_reconcile(self, cr, uid, ids, context=None):
+        cur_obj = self.pool.get('res.currency')
+        if context is None:
+            context = {}
+        data =  self.read(cr, uid, ids,context=context)[0]
+        writeoff_account_id = False
+        writeoff_journal_id = False
+        comment = False
+
+        if 'write_off' in context and context['write_off'] :
+            writeoff_account_id = context['write_off']['writeoff_acc_id']
+            writeoff_journal_id = context['write_off']['writeoff_journal_id']
+            comment = context['write_off']['comment']
+
+        amount = data['amount']
+
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context)
+        journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context)
+        # Compute the amount in company's currency, with the journal currency (which is equal to payment currency)
+        # when it is needed :  If payment currency (according to selected journal.currency) is <> from company currency
+        if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
+            ctx = {'date':data['date']}
+            amount = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, amount, context=ctx)
+            currency_id = journal.currency.id
+            # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
+            context.update({'amount_currency':data['amount'],'currency_id':currency_id})
+
+        if invoice.company_id.currency_id.id<>invoice.currency_id.id:
+            ctx = {'date':data['date']}
+            amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, amount, context=ctx)
+            currency_id = invoice.currency_id.id
+            # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
+            context.update({'amount_currency':data['amount'],'currency_id':currency_id})
+
+        # Take the choosen date
+        if comment:
+            context.update({'date_p':data['date'],'comment':comment})
+        else:
+            context.update({'date_p':data['date'],'comment':False})
+
+        acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id
+        if not acc_id:
+            raise osv.except_osv(_('Error !'), _('Your journal must have a default credit and debit account.'))
+        self.pool.get('account.invoice').pay_and_reconcile(cr, uid, [context['active_id']],
+                amount, acc_id, data['period_id'], data['journal_id'], writeoff_account_id,
+                data['period_id'], writeoff_journal_id, context, data['name'])
+        return {}
+
+account_invoice_pay()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_pay_invoice_view.xml b/addons/account/wizard/account_pay_invoice_view.xml
new file mode 100644
index 00000000000..0a8e64d299f
--- /dev/null
+++ b/addons/account/wizard/account_pay_invoice_view.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_invoice_pay" model="ir.ui.view">
+            <field name="name">account.invoice.pay.form</field>
+            <field name="model">account.invoice.pay</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pay invoice">
+                	<group colspan="4" >
+						<field name="amount"/>
+					    <newline/>
+					    <field name="name"/>
+					    <field name="date"/>
+					    <field name="journal_id"/>
+					    <field name="period_id"/>
+                	</group>
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Partial Payment" name="pay_and_reconcile" type="object"/>
+                    	<button icon="gtk-execute" string="Full Payment" name="wo_check" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+
+		<act_window name="Pay Invoice"
+				res_model="account.invoice.pay"
+				src_model="account.invoice"
+				view_mode="form"
+				target="new"
+				key2="client_action_multi"
+			id="action_view_account_invoice_pay"/>
+
+		<record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
+            <field name="name">account.invoice.pay.writeoff.form</field>
+            <field name="model">account.invoice.pay.writeoff</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Information addendum">
+                	<group colspan="4" >
+					    <separator string="Write-Off Move" colspan="4"/>
+					    <field name="writeoff_journal_id"/>
+    					<field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+    					<field name="comment"/>
+    					<separator string="Analytic" colspan="4"/>
+    					<field name="analytic_id"/>
+                	</group>
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Pay and reconcile" name="pay_and_reconcile_writeoff" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index f4c54263f9a..6e71b079dc0 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -21,7 +21,6 @@
 
 from osv import fields, osv
 from tools.translate import _
-import tools
 
 class account_period_close(osv.osv_memory):
     """
@@ -30,7 +29,7 @@ class account_period_close(osv.osv_memory):
     _name = "account.period.close"
     _description = "period close"
     _columns = {
-        'sure': fields.boolean('Check this box', required=False),
+        'sure': fields.boolean('Check this box'),
               }
 
     def data_save(self, cr, uid, ids, context={}):
@@ -47,8 +46,8 @@ class account_period_close(osv.osv_memory):
                 for id in context['active_ids']:
                     cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
-            return {}
+        return {}
 
 account_period_close()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_print_journal.py b/addons/account/wizard/account_print_journal.py
new file mode 100644
index 00000000000..89de9a643f9
--- /dev/null
+++ b/addons/account/wizard/account_print_journal.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import osv, fields
+from tools.translate import _
+
+class account_print_journal(osv.osv_memory):
+    _name = 'account.print.journal'
+    _description = 'Account Print Journal'
+
+    _columns = {
+        'journal_id': fields.many2many('account.journal', 'account_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
+        'period_id': fields.many2many('account.period', 'account_period_rel', 'account_id', 'period_id', 'Periods',  required=True),
+        'sort_selection': fields.selection([('date','By date'),
+                                            ('ref','Reference Number'),],
+                                              'Entries Sorted By', required=True),
+        }
+
+    _defaults = {
+            'sort_selection': lambda *a: 'date',
+            }
+
+    def check_data(self, cr, uid, ids, context={}):
+        obj_jperiod = self.pool.get('account.journal.period')
+        datas = {}
+        datas['ids'] = []
+        datas['model'] = 'account.journal.period'
+        datas['form'] = self.read(cr, uid, ids)[0]
+        period_id = datas['form']['period_id']
+        journal_id = datas['form']['journal_id']
+
+        if type(period_id)==type([]):
+            ids_final = []
+            for journal in journal_id:
+                for period in period_id:
+                    ids_journal_period = obj_jperiod.search(cr,uid, [('journal_id','=',journal),('period_id','=',period)], context=context)
+                    if ids_journal_period:
+                        ids_final.append(ids_journal_period)
+                if not ids_final:
+                    raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account.journal.period.print',
+            'datas': datas,
+            }
+
+account_print_journal()
+
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_print_journal_view.xml b/addons/account/wizard/account_print_journal_view.xml
new file mode 100644
index 00000000000..078db421b19
--- /dev/null
+++ b/addons/account/wizard/account_print_journal_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="view_account_print_journal" model="ir.ui.view">
+            <field name="name">Account Print Journal</field>
+            <field name="model">account.print.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Print Journal">
+			    <group col="4" colspan="6">
+				    <field name="journal_id"/>
+				    <field name="period_id"/>
+				    <newline/>
+				    <field name="sort_selection"/>
+				</group>
+				<separator colspan="4"/>
+			    <group col="2" colspan="4">
+	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+				</group>
+			</form>
+            </field>
+        </record>
+
+        <record id="action_account_print_journal" model="ir.actions.act_window">
+            <field name="name">Account Print Journal</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.print.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+		<menuitem
+	        name="Print Journal"
+	        parent="account.menu_generic_report"
+	        action="action_account_print_journal"
+	        id="menu_account_print_journal"
+	        icon="STOCK_PRINT"/>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py
new file mode 100644
index 00000000000..4703ea18c61
--- /dev/null
+++ b/addons/account/wizard/account_state_open.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import osv, fields
+
+import netsvc
+from tools.translate import _
+
+class account_state_open(osv.osv_memory):
+    _name = 'account.state.open'
+    _description = 'Account State Open'
+
+    def change_inv_state(self, cr, uid, ids, context=None):
+        obj_invoice = self.pool.get('account.invoice')
+        if context is None:
+            context = {}
+        if 'active_ids' in context:
+            data_inv = obj_invoice.browse(cr, uid, context['active_ids'][0], context=context)
+            if data_inv.reconciled:
+                raise osv.except_osv(_('Warning'), _('Invoice is already reconciled'))
+            wf_service = netsvc.LocalService("workflow")
+            res = wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr)
+        return {}
+
+account_state_open()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
new file mode 100644
index 00000000000..3ed71949b2a
--- /dev/null
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_account_state_open" model="ir.ui.view">
+            <field name="name">Account State Open</field>
+            <field name="model">account.state.open</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+					<form string="Open Invoice">
+				    <label string="Are you sure you want to open this invoice ?"/>
+				    <newline/>
+				    <label string="(Invoice should be unreconciled if you want to open it)"/>
+				    <separator colspan="4"/>
+              		<group colspan="2" col="4">
+            			<button special="cancel" string="No"  icon="gtk-no"/>
+            			<button name="change_inv_state" string="Yes" type="object" icon="gtk-yes"/>
+                	</group>
+				</form>
+            </field>
+		</record>
+
+		<record id="action_account_state_open" model="ir.actions.act_window">
+            <field name="name">Account State Open</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.state.open</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_account_state_open"/>
+	        <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_statement_from_invoice.py b/addons/account/wizard/account_statement_from_invoice.py
new file mode 100644
index 00000000000..097d11c1b83
--- /dev/null
+++ b/addons/account/wizard/account_statement_from_invoice.py
@@ -0,0 +1,163 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+from tools.translate import _
+
+class account_statement_from_invoice_lines(osv.osv_memory):
+    """
+    Generate Entries by Statement from Invoices
+    """
+    _name = "account.statement.from.invoice.lines"
+    _description = "Entries by Statement from Invoices"
+    _columns = {
+        'line_ids': fields.many2many('account.move.line', 'account_move_line_relation', 'move_id', 'line_id', 'Invoices'),
+                }
+
+    def populate_statement(self, cr, uid, ids, context=None):
+
+        line_obj = self.pool.get('account.move.line')
+        statement_obj = self.pool.get('account.bank.statement')
+        statement_line_obj = self.pool.get('account.bank.statement.line')
+        currency_obj = self.pool.get('res.currency')
+        statement_reconcile_obj = self.pool.get('account.bank.statement.reconcile')
+
+        data =  self.read(cr, uid, ids,context=context)[0]
+        line_ids = data['line_ids']
+        line_date = time.strftime('%Y-%m-%d')
+
+        if not line_ids:
+            return {}
+        statement_id = 'statement_id' in context and context['statement_id']
+        statement = statement_obj.browse(cr, uid, statement_id, context=context)
+        # for each selected move lines
+        for line in line_obj.browse(cr, uid, line_ids, context=context):
+            ctx = context.copy()
+            #  take the date for computation of currency => use payment date
+            # if line.date_maturity:
+            #     ctx['date'] = line.date_maturity
+            # else:
+            ctx['date'] = line_date
+            amount = 0.0
+            if line.amount_currency:
+                amount = currency_obj.compute(cr, uid, line.currency_id.id,
+                    statement.currency.id, line.amount_currency, context=ctx)
+            else:
+                if line.debit > 0:
+                    amount=line.debit
+                elif line.credit > 0:
+                    amount=-line.credit
+            reconcile_id = statement_reconcile_obj.create(cr, uid, {
+                'line_ids': [(6, 0, [line.id])]
+                }, context=context)
+            if line.journal_id.type == 'sale':
+                type = 'customer'
+            elif line.journal_id.type == 'purchase':
+                type = 'supplier'
+            else:
+                type = 'general'
+            statement_line_obj.create(cr, uid, {
+                'name': line.name or '?',
+                'amount': amount,
+                'type': type,
+                'partner_id': line.partner_id.id,
+                'account_id': line.account_id.id,
+                'statement_id': statement_id,
+                'ref': line.ref,
+                'reconcile_id': reconcile_id,
+                'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or,
+                }, context=context)
+        return {}
+
+account_statement_from_invoice_lines()
+
+class account_statement_from_invoice(osv.osv_memory):
+    """
+    Generate Entries by Statement from Invoices
+    """
+    _name = "account.statement.from.invoice"
+    _description = "Entries by Statement from Invoices"
+    _columns = {
+        'date': fields.date('Date payment',required=True),
+        'journal_ids': fields.many2many('account.journal','account_journal_relation','account_id','journal_id','Journal'),
+        'line_ids': fields.many2many('account.move.line','account_move_line_relation','move_id','line_id','Invoices'),
+        }
+    _defaults = {
+        'date':lambda *a: time.strftime('%Y-%m-%d'),
+        }
+
+    def search_invoices(self, cr, uid, ids, context=None):
+
+        line_obj = self.pool.get('account.move.line')
+        statement_obj = self.pool.get('account.bank.statement')
+        journal_obj = self.pool.get('account.journal')
+        mod_obj = self.pool.get('ir.model.data')
+        statement_id = 'statement_id' in context and context['statement_id']
+
+        data =  self.read(cr, uid, ids,context=context)[0]
+        statement = statement_obj.browse(cr, uid, statement_id, context=context)
+        args_move_line = []
+        repeated_move_line_ids = []
+        # Creating a group that is unique for importing move lines(move lines, once imported into statement lines, should not appear again)
+        for st_line in statement.line_ids:
+            args_move_line = []
+            args_move_line.append(('name','=', st_line.name))
+            args_move_line.append(('ref','=',st_line.ref))
+            if st_line.partner_id:
+                args_move_line.append(('partner_id','=',st_line.partner_id.id))
+            args_move_line.append(('account_id','=',st_line.account_id.id))
+
+            move_line_id = line_obj.search(cr, uid, args_move_line,context=context)
+            if move_line_id:
+                repeated_move_line_ids += move_line_id
+
+        journal_ids = data['journal_ids']
+        if journal_ids == []:
+            journal_ids = journal_obj.search(cr, uid, [('type', 'in', ('sale','cash','purchase'))], context=context)
+
+        args = [
+            ('reconcile_id', '=', False),
+            ('journal_id', 'in', journal_ids),
+            ('account_id.reconcile', '=', True)]
+
+        if repeated_move_line_ids:
+            args.append(('id','not in',repeated_move_line_ids))
+
+        line_ids = line_obj.search(cr, uid, args,
+            #order='date DESC, id DESC', #doesn't work
+            context=context)
+        model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice_lines')], context=context)
+        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+            'domain': "[('id','in', ["+','.join([str(x) for x in line_ids])+"])]",
+            'name': _('Import Entries'),
+            'context': context,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'account.statement.from.invoice.lines',
+            'views': [(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+
+account_statement_from_invoice()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
new file mode 100644
index 00000000000..6f17279888c
--- /dev/null
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_statement_from_invoice" model="ir.ui.view">
+            <field name="name">account.statement.from.invoice.form</field>
+            <field name="model">account.statement.from.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Invoices in Statement">
+                	<group colspan="4" >
+						<field name="date"/>
+						<newline/>
+	                	<field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
+                	</group>
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Go" name="search_invoices" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_view_account_statement_from_invoice" model="ir.actions.act_window">
+        	<field name="name">Import Invoices in Statement</field>
+            <field name="res_model">account.statement.from.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           	<field name="view_id" ref="view_account_statement_from_invoice"/>
+           	<field name="target">new</field>
+        </record>
+
+        <record id="view_account_statement_from_invoice_lines" model="ir.ui.view">
+            <field name="name">account.statement.from.invoice.lines.form</field>
+            <field name="model">account.statement.from.invoice.lines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Entries">
+                	<group colspan="4" >
+	                	<field name="line_ids" />
+                	</group>
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+		<record id="action_view_account_statement_from_invoice_lines" model="ir.actions.act_window">
+        	<field name="name">Import Entries</field>
+            <field name="res_model">account.statement.from.invoice.lines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           	<field name="view_id" ref="view_account_statement_from_invoice_lines"/>
+           	<field name="target">new</field>
+        </record>
+
+
+	</data>
+</openerp>
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
new file mode 100644
index 00000000000..d50994a6f28
--- /dev/null
+++ b/addons/account/wizard/account_unreconcile.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class account_unreconcile(osv.osv_memory):
+    _name = "account.unreconcile"
+    _description = "Account Unreconcile"
+
+    def trans_unrec(self, cr, uid, ids, context=None):
+        obj_move_line = self.pool.get('account.move.line')
+        obj_move_reconcile = self.pool.get('account.move.reconcile')
+        if context is None:
+            context = {}
+        recs = obj_move_line.read(cr, uid, context['active_ids'], ['reconcile_id',])
+        recs = filter(lambda x: x['reconcile_id'], recs)
+        rec_ids = [rec['reconcile_id'][0] for rec in recs]
+        if len(rec_ids):
+            obj_move_reconcile.unlink(cr, uid, rec_ids)
+        return {}
+
+account_unreconcile()
+
+class account_unreconcile_reconcile(osv.osv_memory):
+    _name = "account.unreconcile.reconcile"
+    _description = "Account Unreconcile Reconcile"
+
+    def trans_unrec_reconcile(self, cr, uid, ids, context=None):
+        obj_move_reconcile = self.pool.get('account.move.reconcile')
+        if context is None:
+            context = {}
+        if len(rec_ids):
+            obj_move_reconcile.unlink(cr, uid, context['active_ids'])
+        return {}
+
+account_unreconcile_reconcile()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
new file mode 100644
index 00000000000..3ac038329d9
--- /dev/null
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_unreconcile_view" model="ir.ui.view">
+            <field name="name">Unreconcile Entries</field>
+            <field name="model">account.unreconcile</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Unreconciliation">
+			    <separator string="Unreconciliation transactions" colspan="4"/>
+			    <image name="gtk-dialog-info"/>
+			    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+			    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+        <record id="action_account_unreconcile" model="ir.actions.act_window">
+            <field name="name">Unreconcile Entries</field>
+            <field name="res_model">account.unreconcile</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           <field name="view_id" ref="account_unreconcile_view"/>
+           <field name="target">new</field>
+        </record>
+
+		<record model="ir.values" id="account_unreconcile_values">
+            <field name="model_id" ref="account.model_account_move_line" />
+            <field name="object" eval="1" />
+            <field name="name">Unreconcile Entries</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_unreconcile'))" />
+            <field name="key">action</field>
+            <field name="model">account.move.line</field>
+        </record>
+
+        <record id="account_unreconcile_reconcile_view" model="ir.ui.view">
+            <field name="name">Unreconcile Entries</field>
+            <field name="model">account.unreconcile.reconcile</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Unreconciliation">
+			    <separator string="Unreconciliation transactions" colspan="4"/>
+			    <image name="gtk-dialog-info"/>
+			    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+			    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_account_unreconcile_reconcile" model="ir.actions.act_window">
+            <field name="name">Unreconcile Entries</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.unreconcile.reconcile</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_unreconcile_reconcile_view"/>
+	        <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+		<record model="ir.values" id="account_unreconcile_reconcile_values">
+            <field name="model_id" ref="account.model_account_move_reconcile" />
+            <field name="object" eval="1" />
+            <field name="name">Unreconcile Entries</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_unreconcile_reconcile'))" />
+            <field name="key">action</field>
+            <field name="model">account.move.reconcile</field>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
new file mode 100644
index 00000000000..e3d9e494da6
--- /dev/null
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+
+class validate_account_move(osv.osv_memory):
+    _name = "validate.account.move"
+    _description = "Validate Account Move"
+    _columns = {
+       'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+       'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state','<>','done')]),
+              }
+
+    def validate_move(self, cr, uid, ids, context=None):
+        obj_move = self.pool.get('account.move')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids)[0]
+        ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])])
+        if not ids_move:
+            raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
+        obj_move.button_validate(cr, uid, ids_move, context)
+        return {}
+
+validate_account_move()
+
+class validate_account_move_lines(osv.osv_memory):
+    _name = "validate.account.move.lines"
+    _description = "Validate Account Move Lines"
+
+    def validate_move_lines(self, cr, uid, ids, context=None):
+        obj_move_line = self.pool.get('account.move.line')
+        obj_move = self.pool.get('account.move')
+        move_ids = []
+        if context is None:
+            context = {}
+        data_line = obj_move_line.browse(cr, uid, context['active_ids'], context)
+        for line in data_line:
+            if line.move_id.state=='draft':
+                move_ids.append(line.move_id.id)
+        move_ids = list(set(move_ids))
+        if not move_ids:
+            raise osv.except_osv(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state'))
+        obj_move.button_validate(cr, uid, move_ids, context)
+        return {}
+validate_account_move_lines()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
new file mode 100644
index 00000000000..27ca48662bc
--- /dev/null
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!--Account Moves-->
+        <record id="validate_account_move_view" model="ir.ui.view">
+            <field name="name">Validate Account Move</field>
+            <field name="model">validate.account.move</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Validate Account Entries">
+			    <separator string="Select Period and Journal for Validation" colspan="4"/>
+				    <field name="journal_id"/>
+			    <newline/>
+				    <field name="period_id"/>
+			    <separator string="Information" colspan="4"/>
+				    <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-open" string="Validate" name="validate_move" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+        <record id="action_validate_account_move" model="ir.actions.act_window">
+            <field name="name">Open Journal</field>
+            <field name="res_model">validate.account.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+           <field name="view_id" ref="validate_account_move_view"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem
+	        name="Validate Ledger Postings"
+	        parent="account.menu_finance_periodical_processing"
+	        action="action_validate_account_move"
+	        id="menu_validate_account_moves"
+	       />
+
+<!--Account Move lines-->
+    	<record id="validate_account_move_line_view" model="ir.ui.view">
+            <field name="name">Validate Ledger Postings</field>
+            <field name="model">validate.account.move.lines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Validate Moves">
+              <separator string="Validate Ledger Postings" colspan="4"/>
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+            	<button name="validate_move_lines" string="Validate" type="object" icon="gtk-go-forward" default_focus="1"/>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_validate_account_move_line" model="ir.actions.act_window">
+            <field name="name">Validate Ledger Postings</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">validate.account.move.lines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="validate_account_move_line_view"/>
+	        <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+		<record model="ir.values" id="validate_account_move_line_values">
+            <field name="model_id" ref="account.model_account_move_line" />
+            <field name="object" eval="1" />
+            <field name="name">Validate Ledger Postings</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_validate_account_move_line'))" />
+            <field name="key">action</field>
+            <field name="model">account.move.line</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
new file mode 100755
index 00000000000..7e641628daf
--- /dev/null
+++ b/addons/account/wizard/account_vat.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+class account_vat_declaration(osv.osv_memory):
+	_name = 'account.vat.declaration'
+	_description = 'Account Vat Declaration'
+
+	_columns = {
+        'based_on': fields.selection([('invoices','Invoices'),
+									 ('payments','Payments'),],
+									  'Based On', required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+		'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
+		}
+
+	def _get_company(self, cr, uid, ids, context={}):
+		user_obj = self.pool.get('res.users')
+		company_obj = self.pool.get('res.company')
+		user = user_obj.browse(cr, uid, uid, context=context)
+		if user.company_id:
+			return user.company_id.id
+		else:
+			return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+
+	_defaults = {
+	        'based_on': lambda *a: 'invoices',
+	        'company_id': _get_company
+	    }
+
+	def create_vat(self, cr, uid, ids, context={}):
+		if context is None:
+			context = {}
+		datas = {'ids': context.get('active_ids', [])}
+  		datas['model'] = 'account.tax.code'
+		datas['form'] = self.read(cr, uid, ids)[0]
+		return {
+			'type': 'ir.actions.report.xml',
+			'report_name': 'account.vat.declaration',
+			'datas': datas,
+			}
+
+account_vat_declaration()
+
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
new file mode 100644
index 00000000000..edd6eaf7874
--- /dev/null
+++ b/addons/account/wizard/account_vat_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <menuitem
+            id="menu_tax_report"
+            name="Taxes"
+            parent="account.menu_finance_generic_reporting" sequence="3"/>
+
+		<record id="view_account_vat_declaration" model="ir.ui.view">
+            <field name="name">Account Vat Declaration</field>
+            <field name="model">account.vat.declaration</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Select Period">
+				    <field name="company_id"/>
+					<newline/>
+				    <field name="based_on"/>
+				    <newline/>
+				    <field name="periods"/>
+			    <group col="2" colspan="4">
+	            		<button icon='gtk-cancel' special="cancel"  string="Cancel" />
+						<button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/>
+				</group>
+			</form>
+            </field>
+        </record>
+
+        <record id="action_account_vat_declaration" model="ir.actions.act_window">
+            <field name="name">Account Vat Declaration</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.vat.declaration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+		<menuitem
+	        name="Print Taxes Report"
+	        parent="menu_tax_report"
+	        action="action_account_vat_declaration"
+	        id="menu_account_vat_declaration"
+	        icon="STOCK_PRINT"/>
+
+	</data>
+</openerp>
diff --git a/addons/account/wizard/wizard_central_journal.py b/addons/account/wizard/wizard_central_journal.py
deleted file mode 100644
index 32fb02f3230..00000000000
--- a/addons/account/wizard/wizard_central_journal.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.translate import _
-
-form = '''<?xml version="1.0"?>
-<form string="Print Central Journal">
-    <field name="journal_id"/>
-    <field name="period_id"/>
-</form>'''
-
-fields = {
-  'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'required': True},
-  'period_id': {'string': 'Period', 'type': 'many2many', 'relation': 'account.period', 'required': True},
-}
-
-
-def _check_data(self, cr, uid, data, *args):
-    period_id = data['form']['period_id'][0][2]
-    journal_id=data['form']['journal_id'][0][2]
-
-    if type(period_id)==type([]):
-        
-        ids_final = []
-
-        for journal in journal_id:
-            for period in period_id:
-                ids_journal_period = pooler.get_pool(cr.dbname).get('account.journal.period').search(cr,uid, [('journal_id','=',journal),('period_id','=',period)])
-
-                if ids_journal_period:
-                    ids_final.append(ids_journal_period)
-
-            if not ids_final:
-                raise wizard.except_wizard(_('No Data Available'), _('No records found for your selection!'))
-    return data['form']
-
-
-class wizard_print_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-ok'))},
-        },
-        'print': {
-            'actions': [_check_data],
-            'result': {'type':'print', 'report':'account.central.journal.wiz', 'state':'end'},
-        },
-    }
-wizard_print_journal('account.central.journal.report')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_change_currency.py b/addons/account/wizard/wizard_change_currency.py
deleted file mode 100644
index 45b23e49022..00000000000
--- a/addons/account/wizard/wizard_change_currency.py
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-import wizard
-import pooler
-
-class wizard_change_currency(wizard.interface):
-    '''
-    OpenERP Wizard
-    '''
-    form = '''<?xml version="1.0"?>
-    <form string="Invoice Currency">
-        <field name="currency_id"/>
-    </form>'''
-    
-    message = '''<?xml version="1.0"?>
-    <form string="Invoice Currency">
-        <label string="You can not change currency for Open Invoice !"/>
-    </form>'''
-    
-    fields = {
-        'currency_id': {'string': 'New Currency', 'type': 'many2one', 'relation': 'res.currency', 'required':True},
-    }
-
-    def _get_defaults(self, cr, user, data, context):
-        #TODO : initlize required data
-        
-        return data['form'] 
-
-    def _change_currency(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        
-        inv_obj = pool.get('account.invoice')
-        inv_line_obj = pool.get('account.invoice.line')
-        curr_obj = pool.get('res.currency')
-        
-        invoice_ids = data['ids']
-        new_currency = data['form']['currency_id']
-
-        for invoice in inv_obj.browse(cr, uid, invoice_ids, context=context):
-            if invoice.currency_id.id == new_currency:
-                continue
-            
-            for line in invoice.invoice_line:
-                rate = curr_obj.browse(cr, uid, new_currency).rate
-                new_price = 0
-                if invoice.company_id.currency_id.id == invoice.currency_id.id:
-                    new_price = line.price_unit * rate
-                    
-                if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id == new_currency:
-                    old_rate = invoice.currency_id.rate
-                    new_price = line.price_unit / old_rate
-                    
-                if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id != new_currency:
-                    old_rate = invoice.currency_id.rate
-                    new_price = (line.price_unit / old_rate ) * rate
-                
-                inv_line_obj.write(cr, uid, [line.id], {'price_unit':new_price})
-            inv_obj.write(cr, uid, [invoice.id], {'currency_id':new_currency})
-        return {}
-
-    def _check_what_next(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        inv_obj = pool.get('account.invoice')
-        if inv_obj.browse(cr, uid, data['id']).state != 'draft':
-            return 'message'
-            
-        return 'change'
-        
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'choice', 'next_state': _check_what_next},
-        },
-        'change': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('next', 'Change Currency', 'gtk-go-forward'))},
-        },
-        'next': {
-            'actions': [_change_currency],
-            'result': {'type': 'state', 'state': 'end'},
-        },
-        'message': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': message, 'fields': {}, 'state': [('end', 'Ok', 'gtk-cancel')]},
-        },
-    }
-wizard_change_currency('account.invoice.currency_change')
diff --git a/addons/account/wizard/wizard_fiscalyear_close.py b/addons/account/wizard/wizard_fiscalyear_close.py
deleted file mode 100644
index cbf4b8d0529..00000000000
--- a/addons/account/wizard/wizard_fiscalyear_close.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import osv
-import pooler
-from tools.translate import _
-
-_transaction_form = '''<?xml version="1.0"?>
-<form string="Close Fiscal Year with new entries">
-    <field name="fy_id"/>
-    <field name="fy2_id"/>
-    <field name="journal_id"/>
-    <field name="period_id"/>
-    <field name="report_name" colspan="4"/>
-
-    <separator string="Are you sure you want to create entries?" colspan="4"/>
-    <field name="sure"/>
-</form>'''
-
-_transaction_fields = {
-    'fy_id': {'string':'Fiscal Year to close', 'type':'many2one', 'relation': 'account.fiscalyear','required':True, 'domain':[('state','=','draft')]},
-    'journal_id': {'string':'Opening Entries Journal', 'type':'many2one', 'relation': 'account.journal','required':True},
-    'period_id': {'string':'Opening Entries Period', 'type':'many2one', 'relation': 'account.period','required':True, 'domain':"[('fiscalyear_id','=',fy2_id)]"},
-    'fy2_id': {'string':'New Fiscal Year', 'type':'many2one', 'relation': 'account.fiscalyear', 'domain':[('state','=','draft')], 'required':True},
-    'report_name': {'string':'Name of new entries', 'type':'char', 'size': 64, 'required':True},
-    'sure': {'string':'Check this box', 'type':'boolean'},
-}
-
-def _data_load(self, cr, uid, data, context):
-    data['form']['report_name'] = _('End of Fiscal Year Entry')
-    return data['form']
-
-def _data_save(self, cr, uid, data, context):
-    if not data['form']['sure']:
-        raise wizard.except_wizard(_('UserError'), _('Closing of fiscal year cancelled, please check the box !'))
-    pool = pooler.get_pool(cr.dbname)
-
-    fy_id = data['form']['fy_id']
-    period_ids = pool.get('account.period').search(cr, uid, [('fiscalyear_id', '=', fy_id)])
-    periods_fy2 = pool.get('account.period').search(cr, uid, [('fiscalyear_id', '=', data['form']['fy2_id'])])
-
-    period = pool.get('account.period').browse(cr, uid, data['form']['period_id'], context=context)
-    new_fyear = pool.get('account.fiscalyear').browse(cr, uid, data['form']['fy2_id'], context=context)
-    old_fyear = pool.get('account.fiscalyear').browse(cr, uid, data['form']['fy_id'], context=context)
-
-    new_journal = data['form']['journal_id']
-    new_journal = pool.get('account.journal').browse(cr, uid, new_journal, context=context)
-
-    if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
-        raise wizard.except_wizard(_('UserError'),
-                _('The journal must have default credit and debit account'))
-    if not new_journal.centralisation:
-        raise wizard.except_wizard(_('UserError'),
-                _('The journal must have centralised counterpart'))
-
-    move_ids = pool.get('account.move.line').search(cr, uid, [
-        ('journal_id','=',new_journal.id),('period_id.fiscalyear_id','=',new_fyear.id)])
-    if move_ids:
-        raise wizard.except_wizard(_('UserError'),
-                _('The opening journal must not have any entry in the new fiscal year !'))
-    query = "SELECT id FROM account_fiscalyear WHERE date_stop < '" + str(new_fyear.date_start) + "'"
-    cr.execute(query)
-    result = cr.dictfetchall()
-    fy_ids = ','.join([str(x['id']) for x in result])
-    query_line = pool.get('account.move.line')._query_get(cr, uid,
-            obj='account_move_line', context={'fiscalyear': fy_ids})
-    cr.execute('select id from account_account WHERE active')
-    ids = map(lambda x: x[0], cr.fetchall())
-    for account in pool.get('account.account').browse(cr, uid, ids,
-        context={'fiscalyear': fy_id}):
-
-        accnt_type_data = account.user_type
-        if not accnt_type_data:
-            continue
-        if accnt_type_data.close_method=='none' or account.type == 'view':
-            continue
-        if accnt_type_data.close_method=='balance':
-            if abs(account.balance)>0.0001:
-                pool.get('account.move.line').create(cr, uid, {
-                    'debit': account.balance>0 and account.balance,
-                    'credit': account.balance<0 and -account.balance,
-                    'name': data['form']['report_name'],
-                    'date': period.date_start,
-                    'journal_id': new_journal.id,
-                    'period_id': period.id,
-                    'account_id': account.id
-                }, {'journal_id': new_journal.id, 'period_id':period.id})
-        if accnt_type_data.close_method == 'unreconciled':
-            offset = 0
-            limit = 100
-            while True:
-                cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
-                            'amount_currency, currency_id, blocked, partner_id, ' \
-                            'date_maturity, date_created ' \
-                        'FROM account_move_line ' \
-                        'WHERE account_id = %s ' \
-                            'AND ' + query_line + ' ' \
-                            'AND reconcile_id is NULL ' \
-                        'ORDER BY id ' \
-                        'LIMIT %s OFFSET %s', (account.id, limit, offset))
-                result = cr.dictfetchall()
-                if not result:
-                    break
-                for move in result:
-                    move.pop('id')
-                    move.update({
-                        'date': period.date_start,
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                    })
-                    pool.get('account.move.line').create(cr, uid, move, {
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                        })
-                offset += limit
-
-            #We have also to consider all move_lines that were reconciled
-            #on another fiscal year, and report them too
-            offset = 0
-            limit = 100
-            while True:
-                #TODO: this query could be improved in order to work if there is more than 2 open FY
-                # a.period_id IN ('+fy2_period_set+') is the problematic clause
-                cr.execute('SELECT b.id, b.name, b.quantity, b.debit, b.credit, b.account_id, b.ref, ' \
-                            'b.amount_currency, b.currency_id, b.blocked, b.partner_id, ' \
-                            'b.date_maturity, b.date_created ' \
-                        'FROM account_move_line a, account_move_line b ' \
-                        'WHERE b.account_id = %s ' \
-                            'AND b.reconcile_id is NOT NULL ' \
-                            'AND a.reconcile_id = b.reconcile_id ' \
-                            'AND b.period_id =ANY(%s)'\
-                            'AND a.period_id =ANY(%s)' \
-                        'ORDER BY id ' \
-                        'LIMIT %s OFFSET %s', (account.id,period_ids,periods_fy2,limit, offset))
-                result = cr.dictfetchall()
-                if not result:
-                    break
-                for move in result:
-                    move.pop('id')
-                    move.update({
-                        'date': period.date_start,
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                    })
-                    pool.get('account.move.line').create(cr, uid, move, {
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                        })
-                offset += limit
-        if accnt_type_data.close_method=='detail':
-            offset = 0
-            limit = 100
-            while True:
-                cr.execute('SELECT id, name, quantity, debit, credit, account_id, ref, ' \
-                            'amount_currency, currency_id, blocked, partner_id, ' \
-                            'date_maturity, date_created ' \
-                        'FROM account_move_line ' \
-                        'WHERE account_id = %s ' \
-                            'AND ' + query_line + ' ' \
-                        'ORDER BY id ' \
-                        'LIMIT %s OFFSET %s', (account.id, limit, offset))
-
-                result = cr.dictfetchall()
-                if not result:
-                    break
-                for move in result:
-                    move.pop('id')
-                    move.update({
-                        'date': period.date_start,
-                        'journal_id': new_journal.id,
-                        'period_id': period.id,
-                    })
-                    pool.get('account.move.line').create(cr, uid, move)
-                offset += limit
-    ids = pool.get('account.move.line').search(cr, uid, [('journal_id','=',new_journal.id),
-        ('period_id.fiscalyear_id','=',new_fyear.id)])
-    context['fy_closing'] = True
-
-    if ids:
-        pool.get('account.move.line').reconcile(cr, uid, ids, context=context)
-    new_period = data['form']['period_id']
-    ids = pool.get('account.journal.period').search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)])
-    if not ids:
-        ids = [pool.get('account.journal.period').create(cr, uid, {
-               'name': (new_journal.name or '')+':'+(period.code or ''),
-               'journal_id': new_journal.id,
-               'period_id': period.id
-           })]
-    cr.execute('UPDATE account_fiscalyear ' \
-                'SET end_journal_period_id = %s ' \
-                'WHERE id = %s', (ids[0], old_fyear.id))
-    return {}
-
-class wiz_journal_close(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_data_load],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel', 'gtk-cancel'),('close','Create', 'gtk-ok')]}
-        },
-        'close': {
-            'actions': [_data_save],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_journal_close('account.fiscalyear.close')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_general_journal.py b/addons/account/wizard/wizard_general_journal.py
deleted file mode 100644
index 26935aa80d6..00000000000
--- a/addons/account/wizard/wizard_general_journal.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.translate import _
-
-form = '''<?xml version="1.0"?>
-<form string="Print General Journal">
-    <field name="journal_id"/>
-    <field name="period_id"/>
-</form>'''
-
-fields = {
-  'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'required': True},
-  'period_id': {'string': 'Period', 'type': 'many2many', 'relation': 'account.period', 'required': True},
-}
-
-def _check_data(self, cr, uid, data, *args):
-    period_id = data['form']['period_id'][0][2]
-    journal_id=data['form']['journal_id'][0][2]
-
-    if type(period_id)==type([]):
-        
-        ids_final = []
-
-        for journal in journal_id:
-            for period in period_id:
-                ids_journal_period = pooler.get_pool(cr.dbname).get('account.journal.period').search(cr,uid, [('journal_id','=',journal),('period_id','=',period)])
-
-                if ids_journal_period:
-                    ids_final.append(ids_journal_period)
-
-            if not ids_final:
-                raise wizard.except_wizard(_('No Data Available'), _('No records found for your selection!'))
-    return data['form']
-
-class wizard_print_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-ok'))},
-        },
-        'print': {
-            'actions': [_check_data],
-            'result': {'type':'print', 'report':'account.general.journal.wiz', 'state':'end'},
-        },
-    }
-wizard_print_journal('account.general.journal.report')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_invoice_state.py b/addons/account/wizard/wizard_invoice_state.py
deleted file mode 100644
index 342ce5a97be..00000000000
--- a/addons/account/wizard/wizard_invoice_state.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-def _invoice_confirm(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService('workflow')
-    for id in data['ids']:
-        wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_open', cr)
-    return {}
-
-class wizard_invoice_confirm(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_invoice_confirm], 
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-wizard_invoice_confirm('account.invoice.state.confirm')
-
-
-def _invoice_cancel(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService('workflow')
-    for id in data['ids']:
-        wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
-    return {}
-
-class wizard_invoice_cancel(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_invoice_cancel], 
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-wizard_invoice_cancel('account.invoice.state.cancel')
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_journal_select.py b/addons/account/wizard/wizard_journal_select.py
deleted file mode 100644
index 123a07fb627..00000000000
--- a/addons/account/wizard/wizard_journal_select.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-def _action_open_window(self, cr, uid, data, context):
-    mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
-    act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
-
-    result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_select')
-    id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-    result = act_obj.read(cr, uid, [id])[0]
-
-    cr.execute('select journal_id,period_id from account_journal_period where id=%s', (data['id'],))
-    journal_id,period_id = cr.fetchone()
-
-    result['domain'] = str([('journal_id', '=', journal_id), ('period_id', '=', period_id)])
-    result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
-    return result
-
-class wiz_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-wiz_journal('account.move.journal.select')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_open_closed_fiscalyear.py b/addons/account/wizard/wizard_open_closed_fiscalyear.py
deleted file mode 100644
index 18ac86c8107..00000000000
--- a/addons/account/wizard/wizard_open_closed_fiscalyear.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-from osv import fields, osv
-from tools.translate import _
-
-form = """<?xml version="1.0"?>
-<form string="Choose Fiscal Year">
-    <field name="fyear_id" domain="[('state','=','draft')]"/>
-</form>
-"""
-
-fields = {
-    'fyear_id': {'string': 'Fiscal Year to Open', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True},
-}
-
-def _remove_entries(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    data_fyear = pool.get('account.fiscalyear').browse(cr,uid,data['form']['fyear_id'])
-    if not data_fyear.end_journal_period_id:
-        raise wizard.except_wizard(_('Error'), _('No journal for ending writing has been defined for the fiscal year'))
-    period_journal = data_fyear.end_journal_period_id
-    ids_move = pool.get('account.move').search(cr,uid,[('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
-    if ids_move:
-        cr.execute('delete from account_move where id =ANY(%s)',(ids_move,))
-    #cr.execute('UPDATE account_journal_period ' \
-    #        'SET state = %s ' \
-    #        'WHERE period_id IN (SELECT id FROM account_period WHERE fiscalyear_id = %s)',
-    #        ('draft',data_fyear))
-    #cr.execute('UPDATE account_period SET state = %s ' \
-    #        'WHERE fiscalyear_id = %s', ('draft',data_fyear))
-    #cr.execute('UPDATE account_fiscalyear ' \
-    #        'SET state = %s, end_journal_period_id = null '\
-    #        'WHERE id = %s', ('draft',data_fyear))
-    return {}
-
-class open_closed_fiscal(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result': {
-                'type': 'form',
-                'arch': form,
-                'fields': fields,
-                'state':[('end','Cancel', 'gtk-cancel'),('open','Open', 'gtk-ok')]
-            }
-        },
-        'open': {
-            'actions': [],
-            'result': {
-                'type':'action',
-                'action':_remove_entries,
-                'state':'end'
-            },
-        },
-    }
-open_closed_fiscal("account.open_closed_fiscalyear")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_pay_invoice.py b/addons/account/wizard/wizard_pay_invoice.py
deleted file mode 100644
index f534a72a77f..00000000000
--- a/addons/account/wizard/wizard_pay_invoice.py
+++ /dev/null
@@ -1,188 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-import time
-from tools.translate import _
-import tools
-import decimal_precision as dp
-
-
-pay_form = '''<?xml version="1.0"?>
-<form string="Pay invoice">
-    <field name="amount"/>
-    <newline/>
-    <field name="name"/>
-    <field name="date"/>
-    <field name="journal_id"/>
-    <field name="period_id"/>
-</form>'''
-
-pay_fields = {
-    'amount': {'string': 'Amount paid', 'type':'float', 'required':True, 'digits': (16,dp.get_precision('Account'))},
-    'name': {'string': 'Entry Name', 'type':'char', 'size': 64, 'required':True},
-    'date': {'string': 'Payment date', 'type':'date', 'required':True, 'default':lambda *args: time.strftime('%Y-%m-%d')},
-    'journal_id': {'string': 'Journal/Payment Mode', 'type': 'many2one', 'relation':'account.journal', 'required':True, 'domain':[('type','=','cash')]},
-    'period_id': {'string': 'Period', 'type': 'many2one', 'relation':'account.period', 'required':True},
-}
-
-def _pay_and_reconcile(self, cr, uid, data, context):
-    form = data['form']
-    period_id = form.get('period_id', False)
-    journal_id = form.get('journal_id', False)
-    writeoff_account_id = form.get('writeoff_acc_id', False)
-    writeoff_journal_id = form.get('writeoff_journal_id', False)
-    pool = pooler.get_pool(cr.dbname)
-    cur_obj = pool.get('res.currency')
-    amount = form['amount']
-    context['analytic_id'] = form.get('analytic_id', False)
-
-    invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
-    journal = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context)
-    # Compute the amount in company's currency, with the journal currency (which is equal to payment currency) 
-    # when it is needed :  If payment currency (according to selected journal.currency) is <> from company currency
-    if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
-        ctx = {'date':data['form']['date']}
-        amount = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, amount, context=ctx)
-        currency_id = journal.currency.id
-        # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
-        context.update({'amount_currency':form['amount'],'currency_id':currency_id})
-    
-    if invoice.company_id.currency_id.id<>invoice.currency_id.id:
-        ctx = {'date':data['form']['date']}
-        amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, amount, context=ctx)
-        currency_id = invoice.currency_id.id
-        # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
-        context.update({'amount_currency':form['amount'],'currency_id':currency_id})
-        
-    # Take the choosen date
-    if form.has_key('comment'):
-        context.update({'date_p':form['date'],'comment':form['comment']})
-    else:
-        context.update({'date_p':form['date'],'comment':False})      
-
-    acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id
-    if not acc_id:
-        raise wizard.except_wizard(_('Error !'), _('Your journal must have a default credit and debit account.'))
-    pool.get('account.invoice').pay_and_reconcile(cr, uid, [data['id']],
-            amount, acc_id, period_id, journal_id, writeoff_account_id,
-            period_id, writeoff_journal_id, context, data['form']['name'])
-    return {}
-
-def _wo_check(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
-    journal = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context)
-    cur_obj = pool.get('res.currency')
-    # Here we need that:
-    #    The invoice total amount in company's currency <> paid amount in company currency
-    #    (according to the correct day rate, invoicing rate and payment rate are may be different)
-    #    => Ask to a write-off of the difference. This could happen even if both amount are equal,
-    #    because if the currency rate
-    # Get the amount in company currency for the invoice (according to move lines)
-    inv_amount_company_currency = 0
-    for aml in invoice.move_id.line_id:
-        if aml.account_id.id == invoice.account_id.id or aml.account_id.type in ('receivable', 'payable'):
-            inv_amount_company_currency += aml.debit
-            inv_amount_company_currency -= aml.credit
-    inv_amount_company_currency = abs(inv_amount_company_currency)
-
-    # Get the current amount paid in company currency
-    if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
-        ctx = {'date':data['form']['date']}
-        amount_paid = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, data['form']['amount'], round=True, context=ctx)
-    else:
-        amount_paid = data['form']['amount']
-    # Get the old payment if there are some
-    if invoice.payment_ids:
-        debit=credit=0.0
-        for payment in invoice.payment_ids:
-            debit+=payment.debit
-            credit+=payment.credit
-        amount_paid+=abs(debit-credit)
-        
-    # Test if there is a difference according to currency rouding setting
-    if pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
-            (amount_paid - inv_amount_company_currency)):
-        return 'reconcile'
-    return 'addendum'
-
-_transaction_add_form = '''<?xml version="1.0"?>
-<form string="Information addendum">
-    <separator string="Write-Off Move" colspan="4"/>
-    <field name="writeoff_journal_id"/>
-    <field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-    <field name="comment"/>
-    <separator string="Analytic" colspan="4"/>
-    <field name="analytic_id"/>
-</form>'''
-
-_transaction_add_fields = {
-    'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True},
-    'writeoff_journal_id': {'string': 'Write-Off journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
-    'comment': {'string': 'Comment', 'type':'char', 'size': 64 , 'required':True},
-    'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'},
-}
-
-def _get_value_addendum(self, cr, uid, data, context={}):
-    return {'comment': _('Write-Off')}
-
-def _get_period(self, cr, uid, data, context={}):
-    pool = pooler.get_pool(cr.dbname)
-    ids = pool.get('account.period').find(cr, uid, context=context)
-    period_id = False
-    if len(ids):
-        period_id = ids[0]
-    invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
-    if invoice.state in ['draft', 'proforma2', 'cancel']:
-        raise wizard.except_wizard(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
-    return {
-        'period_id': period_id,
-        'amount': invoice.residual,
-        'date': time.strftime('%Y-%m-%d')
-    }
-
-class wizard_pay_invoice(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_period],
-            'result': {'type':'form', 'arch':pay_form, 'fields':pay_fields, 'state':[('end','Cancel'),('reconcile','Partial Payment'),('writeoff_check','Full Payment')]}
-        },
-        'writeoff_check': {
-            'actions': [],
-            'result' : {'type': 'choice', 'next_state': _wo_check }
-        },
-        'addendum': {
-            'actions': [_get_value_addendum],
-            'result': {'type': 'form', 'arch':_transaction_add_form, 'fields':_transaction_add_fields, 'state':[('end','Cancel'),('reconcile','Pay and reconcile')]}
-        },
-        'reconcile': {
-            'actions': [_pay_and_reconcile],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-wizard_pay_invoice('account.invoice.pay')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py
deleted file mode 100644
index 8cd95608256..00000000000
--- a/addons/account/wizard/wizard_print_journal.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.translate import _
-
-form = '''<?xml version="1.0"?>
-<form string="Print Journal">
-    <field name="journal_id"/>
-    <field name="period_id"/>
-    <field name="sort_selection"/>
-</form>'''
-
-fields = {
-  'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'required': True},
-  'period_id': {'string': 'Period', 'type': 'many2many', 'relation': 'account.period', 'required': True},
-  'sort_selection':{
-        'string':"Entries Sorted By",
-        'type':'selection',
-        'selection':[('date','By date'),('ref','Reference Number')],
-        'required':True,
-        'default': lambda *a: 'date',
-    },
-
-}
-
-def _check_data(self, cr, uid, data, *args):
-    period_id = data['form']['period_id'][0][2]
-    journal_id=data['form']['journal_id'][0][2]
-
-    if type(period_id)==type([]):
-        
-        ids_final = []
-
-        for journal in journal_id:
-            for period in period_id:
-                ids_journal_period = pooler.get_pool(cr.dbname).get('account.journal.period').search(cr,uid, [('journal_id','=',journal),('period_id','=',period)])
-
-                if ids_journal_period:
-                    ids_final.append(ids_journal_period)
-
-            if not ids_final:
-                raise wizard.except_wizard(_('No Data Available'), _('No records found for your selection!'))
-    return data['form']
-
-class wizard_print_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-ok'))},
-        },
-        'print': {
-            'actions': [_check_data],
-            'result': {'type':'print', 'report':'account.journal.period.print.wiz', 'state':'end'},
-        },
-    }
-wizard_print_journal('account.print.journal.report')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_statement_from_invoice.py b/addons/account/wizard/wizard_statement_from_invoice.py
deleted file mode 100644
index 6e9f912380f..00000000000
--- a/addons/account/wizard/wizard_statement_from_invoice.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2008 Camptocamp SA All Rights Reserved. (JGG)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# 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 2
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.    
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.misc import UpdateableStr
-import time
-
-FORM = UpdateableStr()
-
-FIELDS = {
-    'lines': {'string': 'Invoices', 'type': 'many2many',
-        'relation': 'account.move.line'},
-        
-}
-
-START_FIELD = {
-    'date': {'string': 'Date payment', 'type': 'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'domain': '[("type","in",["sale","purchase","cash"])]', 'help': 'This field allows you to choose the accounting journals you want for filtering the invoices. If you left this field empty, it will search on all sale, purchase and cash journals.'},
-}
-
-START_FORM = '''<?xml version="1.0"?>
-<form string="Import Invoices in Statement">
-    <label string="Choose Journal and Payment Date" colspan="4"/>
-    <field name="date"/>
-    <field name="journal_id" colspan="4"/>
-</form>'''
-
-def _search_invoices(obj, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    line_obj = pool.get('account.move.line')
-    statement_obj = pool.get('account.bank.statement')
-    journal_obj = pool.get('account.journal')
-
-    statement = statement_obj.browse(cr, uid, data['id'], context=context)
-    args_move_line = []
-    repeated_move_line_ids = []
-    # Creating a group that is unique for importing move lines(move lines, once imported into statement lines, should not appear again)
-    for st_line in statement.line_ids:
-        args_move_line = []
-        args_move_line.append(('name','=', st_line.name))
-        args_move_line.append(('ref','=',st_line.ref))
-        if st_line.partner_id:
-            args_move_line.append(('partner_id','=',st_line.partner_id.id))
-        args_move_line.append(('account_id','=',st_line.account_id.id))
-        
-        move_line_id = line_obj.search(cr, uid, args_move_line,context=context)
-        if move_line_id:
-            repeated_move_line_ids += move_line_id
-        
-    journal_ids = data['form']['journal_id'][0][2]
-
-    if journal_ids == []:
-        journal_ids = journal_obj.search(cr, uid, [('type', 'in', ('sale','cash','purchase'))], context=context)
-    
-    args = [
-        ('reconcile_id', '=', False),
-        ('journal_id', 'in', journal_ids),
-        ('account_id.reconcile', '=', True)]
-    
-    if repeated_move_line_ids:
-        args.append(('id','not in',repeated_move_line_ids))
-           
-    line_ids = line_obj.search(cr, uid, args,
-        #order='date DESC, id DESC', #doesn't work
-        context=context)
-        
-    FORM.string = '''<?xml version="1.0"?>
-<form string="Import Entries">
-    <field name="lines" colspan="4" height="300" width="800" nolabel="1"
-        domain="[('id', 'in', [%s])]"/>
-</form>''' % (','.join([str(x) for x in line_ids]))
-    return {}
-
-def _populate_statement(obj, cursor, user, data, context):
-    line_ids = data['form']['lines'][0][2]
-    line_date=data['form']['date']
-    if not line_ids:
-        return {}
-
-    pool = pooler.get_pool(cursor.dbname)
-    line_obj = pool.get('account.move.line')
-    statement_obj = pool.get('account.bank.statement')
-    statement_line_obj = pool.get('account.bank.statement.line')
-    currency_obj = pool.get('res.currency')
-    statement_reconcile_obj = pool.get('account.bank.statement.reconcile')
-
-    statement = statement_obj.browse(cursor, user, data['id'], context=context)
-    # for each selected move lines
-    for line in line_obj.browse(cursor, user, line_ids, context=context):
-        ctx = context.copy()
-        #  take the date for computation of currency => use payment date
-        # if line.date_maturity:
-        #     ctx['date'] = line.date_maturity 
-        # else:
-        ctx['date'] = line_date
-        amount = 0.0
-        if line.amount_currency:
-            amount = currency_obj.compute(cursor, user, line.currency_id.id,
-                statement.currency.id, line.amount_currency, context=ctx)
-        else:
-            if line.debit > 0:
-                amount=line.debit
-            elif line.credit > 0:
-                amount=-line.credit
-        reconcile_id = statement_reconcile_obj.create(cursor, user, {
-            'line_ids': [(6, 0, [line.id])]
-            }, context=context)
-        if line.journal_id.type == 'sale':
-            type = 'customer'
-        elif line.journal_id.type == 'purchase':
-            type = 'supplier'
-        else:
-            type = 'general'
-        
-        statement_line_obj.create(cursor, user, {
-            'name': line.name or '?',
-            'amount': amount,
-            'type': type,
-            'partner_id': line.partner_id.id,
-            'account_id': line.account_id.id,
-            'statement_id': statement.id,
-            'ref': line.ref,
-            'reconcile_id': reconcile_id,
-            'date':line_date, #time.strftime('%Y-%m-%d'), #line.date_maturity or,
-            }, context=context)
-    return {}
-    
-    
-class PopulateStatementFromInv(wizard.interface):
-    """
-    Populate the current statement with selected invoices
-    """
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': START_FORM,
-                'fields':START_FIELD,
-                'state': [
-                    ('end', '_Cancel'),
-                    ('go', '_Go', '', True),
-                ]
-            },
-        },
-        'go': {
-            'actions': [_search_invoices],
-            'result': {
-                'type': 'form',
-                'arch': FORM,
-                'fields': FIELDS,
-                'state': [
-                    ('end', '_Cancel','', True, 'gtk-cancel'),
-                    ('finish', 'O_k','', True, 'gtk-ok')
-                ]
-            },
-        },
-
-        'finish': {
-        'actions': [],
-        'result': {
-            'type': 'action',
-            'action': _populate_statement,
-            'state': 'end'
-        },
-    },
-    }
-PopulateStatementFromInv('populate_statement_from_inv')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/wizard_unreconcile.py b/addons/account/wizard/wizard_unreconcile.py
deleted file mode 100644
index e42a1bc080b..00000000000
--- a/addons/account/wizard/wizard_unreconcile.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-_info_form = '''<?xml version="1.0"?>
-<form string="Unreconciliation">
-    <separator string="Unreconciliation transactions" colspan="4"/>
-    <image name="gtk-dialog-info" colspan="2"/>
-    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-</form>'''
-
-def _trans_unrec(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    recs = pool.get('account.move.line').read(cr, uid, data['ids'], ['reconcile_id',])
-    recs = filter(lambda x: x['reconcile_id'], recs)
-    rec_ids = [rec['reconcile_id'][0] for rec in recs]
-    if len(rec_ids):
-        pooler.get_pool(cr.dbname).get('account.move.reconcile').unlink(cr, uid, rec_ids)
-    return {}
-
-class wiz_unreconcile(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': _info_form, 'fields': {}, 'state':[('end', 'Cancel', 'gtk-cancel'), ('unrec', 'Unreconcile', 'gtk-ok')]}
-        },
-        'unrec': {
-            'actions': [_trans_unrec],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_unreconcile('account.move.line.unreconcile')
-
-
-def _trans_unrec_reconcile(self, cr, uid, data, context):
-    rec_ids = data['ids']
-    if len(rec_ids):
-        pooler.get_pool(cr.dbname).get('account.move.reconcile').unlink(cr, uid, rec_ids)
-    return {}
-
-class wiz_unreconcile_reconcile(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': _info_form, 'fields': {}, 'state':[('end', 'Cancel', 'gtk-cancel'), ('unrec', 'Unreconcile', 'gtk-ok')]}
-        },
-        'unrec': {
-            'actions': [_trans_unrec_reconcile],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_unreconcile_reconcile('account.reconcile.unreconcile')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_validate_account_move.py b/addons/account/wizard/wizard_validate_account_move.py
deleted file mode 100644
index 1b56431b4b9..00000000000
--- a/addons/account/wizard/wizard_validate_account_move.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-from osv import osv
-import pooler
-from tools.translate import _
-
-_journal_form = '''<?xml version="1.0"?>
-<form string="Validate Account Entries">
-    <separator string="Select Period and Journal for Validation" colspan="4"/>
-    <field name="journal_id"/>
-    <newline/>
-    <field name="period_id"/>
-    <separator string="Information" colspan="4"/>
-    <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
-</form>'''
-
-_journal_fields = {
-    'journal_id': {'string':'Journal', 'type':'many2one', 'relation':'account.journal', 'required':True},
-    'period_id': {'string':'Period', 'type':'many2one', 'relation':'account.period', 'required':True, 'domain':"[('state','<>','done')]"},
-}
-
-def _validate_move(self, cr, uid, data, context={}):
-    pool = pooler.get_pool(cr.dbname)
-    move_obj = pool.get('account.move')
-    ids_move = move_obj.search(cr,uid,[('state','=','draft'),('journal_id','=',data['form']['journal_id']),('period_id','=',data['form']['period_id'])])
-    if not ids_move:
-        raise wizard.except_wizard(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
-    res = move_obj.button_validate(cr, uid, ids_move, context)
-    return {}
-
-class validate_account_move(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel', 'gtk-cancel'),('validate','Validate', 'gtk-ok')]}
-        },
-        'validate': {
-            'actions': [_validate_move],
-            'result': {'type': 'state', 'state':'end'}
-        },
-    }
-validate_account_move('account.move.validate')
-
-def _validate_move_lines(self, cr, uid, data, context={}):
-    move_ids = []
-    pool = pooler.get_pool(cr.dbname)
-    move_line_obj = pool.get('account.move.line')
-    move_obj = pool.get('account.move')
-    data_line = move_line_obj.browse(cr,uid,data['ids'],context)
-    for line in data_line:
-        if line.move_id.state=='draft':
-            move_ids.append(line.move_id.id)
-    move_ids = list(set(move_ids))
-    if not move_ids:
-        raise wizard.except_wizard(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state'))
-    res = move_obj.button_validate(cr, uid, move_ids, context)
-    return {}
-
-class validate_account_move_lines(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_validate_move_lines],
-            'result': {'type': 'state', 'state':'end'}
-        },
-    }
-validate_account_move_lines('account.move_line.validate')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_vat.py b/addons/account/wizard/wizard_vat.py
deleted file mode 100755
index 6c14402c701..00000000000
--- a/addons/account/wizard/wizard_vat.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import pooler
-
-dates_form = '''<?xml version="1.0"?>
-<form string="Select period">
-	<field name="company_id"/>
-	<newline/>
-	<field name="based_on"/>
-	<field name="periods" colspan="4"/>
-
-	
-</form>'''
-
-dates_fields = {
-	'company_id': {'string': 'Company', 'type': 'many2one',
-		'relation': 'res.company', 'required': True},
-	'based_on':{'string':'Base on', 'type':'selection', 'selection':[
-			('invoices','Invoices'),
-			('payments','Payments'),
-			], 'required':True, 'default': lambda *a: 'invoices'},
-	'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
-
-}
-
-
-class wizard_report(wizard.interface):
-
-	def _get_defaults(self, cr, uid, data, context):
-		pool = pooler.get_pool(cr.dbname)
-		period_obj = pool.get('account.period')
-
-		user = pool.get('res.users').browse(cr, uid, uid, context=context)
-		if user.company_id:
-			company_id = user.company_id.id
-		else:
-			company_id = pool.get('res.company').search(cr, uid,
-					[('parent_id', '=', False)])[0]
-		data['form']['company_id'] = company_id
-
-		return data['form']
-
-	states = {
-		'init': {
-			'actions': [_get_defaults],
-			'result': {
-				'type': 'form',
-				'arch': dates_form,
-				'fields': dates_fields,
-				'state': [
-					('end', 'Cancel', 'gtk-cancel'),
-					('report', 'Print VAT Decl.', 'gtk-ok')
-				]
-			}
-		},
-		'report': {
-			'actions': [],
-			'result': {
-				'type': 'print',
-				'report': 'account.vat.declaration',
-				'state':'end'
-			}
-		}
-	}
-
-wizard_report('account.vat.declaration')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_analysis/__terp__.py b/addons/account_analytic_analysis/__openerp__.py
similarity index 100%
rename from addons/account_analytic_analysis/__terp__.py
rename to addons/account_analytic_analysis/__openerp__.py
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index f9ea49e3b03..b83ce33596d 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -2,7 +2,7 @@
     <data>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
-        <menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
+        <menuitem id="menu_invoicing" name="Billing" parent="next_id_71" sequence="20"/>
 
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
             <field name="name">All Uninvoiced Entries</field>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 0e9bc494a56..64c71c1a2e2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -39,11 +39,11 @@
 
                         <field name="last_invoice_date"/>
 
-                        <field name="last_worked_invoiced_date" select="2"/>
+                        <field name="last_worked_invoiced_date"/>
                         <field name="last_worked_date"/>
                         <separator colspan="4" string="To be invoiced"/>
                         <field name="hours_qtt_non_invoiced"/>
-                        <field name="ca_to_invoice" select="2"/>
+                        <field name="ca_to_invoice"/>
 
                     </page>
                     <page string="Stats by month">
diff --git a/addons/account_analytic_analysis/i18n/ar.po b/addons/account_analytic_analysis/i18n/ar.po
index cff80317df8..02fa5c5377a 100644
--- a/addons/account_analytic_analysis/i18n/ar.po
+++ b/addons/account_analytic_analysis/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index cf8abe95aa8..4457ef801be 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/bs.po b/addons/account_analytic_analysis/i18n/bs.po
index bb594254b41..aa9d6452969 100644
--- a/addons/account_analytic_analysis/i18n/bs.po
+++ b/addons/account_analytic_analysis/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ca.po b/addons/account_analytic_analysis/i18n/ca.po
index 69c7783bebf..5c8bccc2011 100644
--- a/addons/account_analytic_analysis/i18n/ca.po
+++ b/addons/account_analytic_analysis/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/cs.po b/addons/account_analytic_analysis/i18n/cs.po
index 0f198759360..ffddd856f5a 100644
--- a/addons/account_analytic_analysis/i18n/cs.po
+++ b/addons/account_analytic_analysis/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index 6f83b3d423d..a84325eb8df 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/el.po b/addons/account_analytic_analysis/i18n/el.po
index 0335fbd053b..b4187d8afb8 100644
--- a/addons/account_analytic_analysis/i18n/el.po
+++ b/addons/account_analytic_analysis/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index e89c800fac3..d58e171c1d0 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es_AR.po b/addons/account_analytic_analysis/i18n/es_AR.po
index ec66e636e0e..4ab90475b4d 100644
--- a/addons/account_analytic_analysis/i18n/es_AR.po
+++ b/addons/account_analytic_analysis/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/et.po b/addons/account_analytic_analysis/i18n/et.po
index 02e21181c00..a3780ce4c05 100644
--- a/addons/account_analytic_analysis/i18n/et.po
+++ b/addons/account_analytic_analysis/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+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 8454be3a280..938948b2d29 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fr.po b/addons/account_analytic_analysis/i18n/fr.po
index 0815cb24b0a..6bf1d82ec9a 100644
--- a/addons/account_analytic_analysis/i18n/fr.po
+++ b/addons/account_analytic_analysis/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/gl.po b/addons/account_analytic_analysis/i18n/gl.po
index 7e94464275b..9daf49ca8f3 100644
--- a/addons/account_analytic_analysis/i18n/gl.po
+++ b/addons/account_analytic_analysis/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/hr.po b/addons/account_analytic_analysis/i18n/hr.po
index 55a7265b657..4986355fcde 100644
--- a/addons/account_analytic_analysis/i18n/hr.po
+++ b/addons/account_analytic_analysis/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -22,26 +22,27 @@ msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
 msgstr ""
+"Broj sati koji mogu biti fakturirani zajedno s onima koji su već fakturirana."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours summary by user"
-msgstr ""
+msgstr "Sati sažetak od strane korisnika"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr ""
+msgstr "Zadnji Datum fakture"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr ""
+msgstr "Izračunato pomoću formule: Max Cijena  Iznos - Iznos dostavnice."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr ""
+msgstr "Izračunato  pomoću formule: Najveća količina - Ukupno vrijeme"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
@@ -62,28 +63,29 @@ msgstr "Neispravan XML za arhitekturu prikaza!"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr ""
+msgstr "Datum zadnje fakture kreirana za ovaj analitički račun."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theorical Revenue"
-msgstr ""
+msgstr "Prihodi teorijski"
 
 #. module: account_analytic_analysis
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Neispravan naziv modela u akciji definicije."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr ""
+msgstr "Izračunato  pomoću formule: Prihodi Teorijski - Ukupni troškovi"
 
 #. module: account_analytic_analysis
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv objekta mora započeti sa x_ i ne sadrži nikakve posebne karaktere!"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
@@ -94,12 +96,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
-msgstr ""
+msgstr "Teorijska margina"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr ""
+msgstr "Realna margina Stopa (%)"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
@@ -110,7 +112,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
 msgid "Date of the latest work done on this account."
-msgstr ""
+msgstr "Datum najnovijeg rada obavljenog na ovom računu."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -118,6 +120,8 @@ msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
 msgstr ""
+"Ako račun od troškova, to je datum najnoviji rad ili cijene koje su "
+"fakturirane."
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
@@ -127,7 +131,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr ""
+msgstr "Datum Zadnja cijena / Posao"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -140,11 +144,13 @@ msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
 msgstr ""
+"Broj sati provedenih na tom analitičkom račun (iz timesheet). Izračunava se "
+"iz svih dnevnih knjiga za tip 'Općenito'."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Preostalo vrijeme"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -153,6 +159,9 @@ msgid ""
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
 msgstr ""
+"Na temelju troškova koje ste imali na projektu, što bi bio prihod ako svi "
+"ovi troškovi su obračunati po normalnoj  prodajnoj cijeni proistekli iz "
+"cjenika."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -170,7 +179,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
 msgid "My Uninvoiced Entries"
-msgstr ""
+msgstr "Moji nefakturirani Ulazi"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
@@ -190,6 +199,9 @@ msgid ""
 "important data for project manager of services companies.\n"
 "Add menu to show relevant information for each manager."
 msgstr ""
+"Promijeni račun analitički prikaz \n"
+"za važne podatke za projekt menadžer od usluznih tvrtki.\n"
+"Dodaj izbornik za prikaz relevantne informacije za svakog menadžera."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
@@ -245,7 +257,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
 msgid "Real Margin"
-msgstr ""
+msgstr "Reanal margina"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
diff --git a/addons/account_analytic_analysis/i18n/hu.po b/addons/account_analytic_analysis/i18n/hu.po
index 8cf4ac295ab..02ba4854ca9 100644
--- a/addons/account_analytic_analysis/i18n/hu.po
+++ b/addons/account_analytic_analysis/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/id.po b/addons/account_analytic_analysis/i18n/id.po
index 780baee7f09..1a72a3e0299 100644
--- a/addons/account_analytic_analysis/i18n/id.po
+++ b/addons/account_analytic_analysis/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+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 bbfad35e8ca..eed7aa13242 100644
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ko.po b/addons/account_analytic_analysis/i18n/ko.po
index d0394a488ce..7aa1b89d238 100644
--- a/addons/account_analytic_analysis/i18n/ko.po
+++ b/addons/account_analytic_analysis/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+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 57d8d28df22..a83617245e7 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/lv.po b/addons/account_analytic_analysis/i18n/lv.po
index 42f53fe4726..b3a05a6b672 100644
--- a/addons/account_analytic_analysis/i18n/lv.po
+++ b/addons/account_analytic_analysis/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index 6948ce6e713..fbf53ab5080 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index 88de012f341..bd355997007 100644
--- a/addons/account_analytic_analysis/i18n/nl.po
+++ b/addons/account_analytic_analysis/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/oc.po b/addons/account_analytic_analysis/i18n/oc.po
index f3983b94ed0..81e5b7a776c 100644
--- a/addons/account_analytic_analysis/i18n/oc.po
+++ b/addons/account_analytic_analysis/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/pl.po b/addons/account_analytic_analysis/i18n/pl.po
index c799306c378..24a260a3120 100644
--- a/addons/account_analytic_analysis/i18n/pl.po
+++ b/addons/account_analytic_analysis/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index 72f0ed2275c..fdd81c9e070 100644
--- a/addons/account_analytic_analysis/i18n/pt.po
+++ b/addons/account_analytic_analysis/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/pt_BR.po b/addons/account_analytic_analysis/i18n/pt_BR.po
index 5ea183a9bfc..eeeeac23a9a 100644
--- a/addons/account_analytic_analysis/i18n/pt_BR.po
+++ b/addons/account_analytic_analysis/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ro.po b/addons/account_analytic_analysis/i18n/ro.po
index 343165b4c83..887f5b98e68 100644
--- a/addons/account_analytic_analysis/i18n/ro.po
+++ b/addons/account_analytic_analysis/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 5795904f66c..25c0e86cc5d 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sl.po b/addons/account_analytic_analysis/i18n/sl.po
index b9d4a3ac2f6..9f7604a4fc2 100644
--- a/addons/account_analytic_analysis/i18n/sl.po
+++ b/addons/account_analytic_analysis/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/sv.po b/addons/account_analytic_analysis/i18n/sv.po
index c1d741773d3..f80795c989e 100644
--- a/addons/account_analytic_analysis/i18n/sv.po
+++ b/addons/account_analytic_analysis/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tlh.po b/addons/account_analytic_analysis/i18n/tlh.po
index 808c50e0292..f546c528495 100644
--- a/addons/account_analytic_analysis/i18n/tlh.po
+++ b/addons/account_analytic_analysis/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+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 106ef688ea2..0c20cb1593a 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/uk.po b/addons/account_analytic_analysis/i18n/uk.po
index 50332984606..dfd2624abcb 100644
--- a/addons/account_analytic_analysis/i18n/uk.po
+++ b/addons/account_analytic_analysis/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index 8e21ed1b5b3..6170554e1bc 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-11 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/zh_TW.po b/addons/account_analytic_analysis/i18n/zh_TW.po
index 4a0b47329ce..d8363e0dc61 100644
--- a/addons/account_analytic_analysis/i18n/zh_TW.po
+++ b/addons/account_analytic_analysis/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/__terp__.py b/addons/account_analytic_default/__openerp__.py
similarity index 100%
rename from addons/account_analytic_default/__terp__.py
rename to addons/account_analytic_default/__openerp__.py
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 6f8cbadb878..ebf304100fd 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -7,14 +7,14 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Analytic Defaults" editable="bottom">
-                    <field name="sequence" string="Seq"/>
-                    <field name="analytic_id" select="1" required="1"/>
-                    <field name="product_id" select="2"/>
-                    <field name="partner_id" select="2"/>
-                    <field name="user_id" select="2"/>
-                    <field name="company_id" select="2" groups="base.group_multi_company"/>
+                    <field name="sequence"/>
+                    <field name="analytic_id" required="1"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -27,10 +27,10 @@
                     <field name="analytic_id" select="1" required="1"/>
                     <field name="sequence"/>
                     <separator string="Conditions" colspan="4"/>
-                    <field name="product_id" select="2"/>
-                    <field name="partner_id" select="2"/>
-                    <field name="user_id" select="2"/>
-                    <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
+                    <field name="product_id" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="user_id"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                 </form>
diff --git a/addons/account_analytic_default/i18n/ar.po b/addons/account_analytic_default/i18n/ar.po
index 80376ff9dc3..3827a6a9f12 100644
--- a/addons/account_analytic_default/i18n/ar.po
+++ b/addons/account_analytic_default/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/bg.po b/addons/account_analytic_default/i18n/bg.po
index ef8cb6e1c15..5ba6cf7f9ff 100644
--- a/addons/account_analytic_default/i18n/bg.po
+++ b/addons/account_analytic_default/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/bs.po b/addons/account_analytic_default/i18n/bs.po
index 774078afeb2..b12822f0fb0 100644
--- a/addons/account_analytic_default/i18n/bs.po
+++ b/addons/account_analytic_default/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/ca.po b/addons/account_analytic_default/i18n/ca.po
index 86a85160993..9312e9e3748 100644
--- a/addons/account_analytic_default/i18n/ca.po
+++ b/addons/account_analytic_default/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/cs.po b/addons/account_analytic_default/i18n/cs.po
index dfa694a3454..7370d48177b 100644
--- a/addons/account_analytic_default/i18n/cs.po
+++ b/addons/account_analytic_default/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index 7e796ad28ed..dedd1d6595f 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/el.po b/addons/account_analytic_default/i18n/el.po
index 8b59bd06ec5..af49a401d97 100644
--- a/addons/account_analytic_default/i18n/el.po
+++ b/addons/account_analytic_default/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/es.po b/addons/account_analytic_default/i18n/es.po
index de66ca4a43c..0163168e86e 100644
--- a/addons/account_analytic_default/i18n/es.po
+++ b/addons/account_analytic_default/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/es_AR.po b/addons/account_analytic_default/i18n/es_AR.po
index f1100a9141b..44d051158df 100644
--- a/addons/account_analytic_default/i18n/es_AR.po
+++ b/addons/account_analytic_default/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/et.po b/addons/account_analytic_default/i18n/et.po
index 9a1488eeefd..f12475fa7b0 100644
--- a/addons/account_analytic_default/i18n/et.po
+++ b/addons/account_analytic_default/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/fi.po b/addons/account_analytic_default/i18n/fi.po
index 014fa323f7c..19783db3c6e 100644
--- a/addons/account_analytic_default/i18n/fi.po
+++ b/addons/account_analytic_default/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index 34c6d37d38f..6c1480fb356 100644
--- a/addons/account_analytic_default/i18n/fr.po
+++ b/addons/account_analytic_default/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/gl.po b/addons/account_analytic_default/i18n/gl.po
index 5003c4172ea..9a2f29d82a1 100644
--- a/addons/account_analytic_default/i18n/gl.po
+++ b/addons/account_analytic_default/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/hr.po b/addons/account_analytic_default/i18n/hr.po
index fb5e0a6a990..3141f842e58 100644
--- a/addons/account_analytic_default/i18n/hr.po
+++ b/addons/account_analytic_default/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po
index e13982ec5b3..451baab5879 100644
--- a/addons/account_analytic_default/i18n/hu.po
+++ b/addons/account_analytic_default/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/id.po b/addons/account_analytic_default/i18n/id.po
index 454b4181f12..ac32d9b1d5b 100644
--- a/addons/account_analytic_default/i18n/id.po
+++ b/addons/account_analytic_default/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/it.po b/addons/account_analytic_default/i18n/it.po
index c46966e1835..b425eb09866 100644
--- a/addons/account_analytic_default/i18n/it.po
+++ b/addons/account_analytic_default/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/ko.po b/addons/account_analytic_default/i18n/ko.po
index 3f2108fabc7..a10f2bad26c 100644
--- a/addons/account_analytic_default/i18n/ko.po
+++ b/addons/account_analytic_default/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index 329d334cc64..2077bacf1ef 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/lv.po b/addons/account_analytic_default/i18n/lv.po
index 1ffc2c7b974..60edc202028 100644
--- a/addons/account_analytic_default/i18n/lv.po
+++ b/addons/account_analytic_default/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index 972ce61d392..d9a4d0a8479 100644
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index ef98ada68ee..18f60b414aa 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/oc.po b/addons/account_analytic_default/i18n/oc.po
index 86bcd773da6..687ce5ea3a0 100644
--- a/addons/account_analytic_default/i18n/oc.po
+++ b/addons/account_analytic_default/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/pl.po b/addons/account_analytic_default/i18n/pl.po
index 3f71c185d06..111b00fbb82 100644
--- a/addons/account_analytic_default/i18n/pl.po
+++ b/addons/account_analytic_default/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/pt.po b/addons/account_analytic_default/i18n/pt.po
index f09ebbc205e..69ead94d557 100644
--- a/addons/account_analytic_default/i18n/pt.po
+++ b/addons/account_analytic_default/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/pt_BR.po b/addons/account_analytic_default/i18n/pt_BR.po
index 7da2c02723f..844903db7fa 100644
--- a/addons/account_analytic_default/i18n/pt_BR.po
+++ b/addons/account_analytic_default/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/ro.po b/addons/account_analytic_default/i18n/ro.po
index 9271a77bd72..56df13b54e6 100644
--- a/addons/account_analytic_default/i18n/ro.po
+++ b/addons/account_analytic_default/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/ru.po b/addons/account_analytic_default/i18n/ru.po
index 951a06da61f..dca083cd85d 100644
--- a/addons/account_analytic_default/i18n/ru.po
+++ b/addons/account_analytic_default/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/sk.po b/addons/account_analytic_default/i18n/sk.po
index ccc6a92f601..e813b18cbff 100644
--- a/addons/account_analytic_default/i18n/sk.po
+++ b/addons/account_analytic_default/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/sl.po b/addons/account_analytic_default/i18n/sl.po
index ac9f097b973..a280ce42161 100644
--- a/addons/account_analytic_default/i18n/sl.po
+++ b/addons/account_analytic_default/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/sv.po b/addons/account_analytic_default/i18n/sv.po
index a15cd22a1f8..8f0807130b8 100644
--- a/addons/account_analytic_default/i18n/sv.po
+++ b/addons/account_analytic_default/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/tlh.po b/addons/account_analytic_default/i18n/tlh.po
index 0e2de9073b7..02d5c24ef37 100644
--- a/addons/account_analytic_default/i18n/tlh.po
+++ b/addons/account_analytic_default/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+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 dd35ade0116..a139a0c265a 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/uk.po b/addons/account_analytic_default/i18n/uk.po
index 1e1039f138f..5e4def88b9b 100644
--- a/addons/account_analytic_default/i18n/uk.po
+++ b/addons/account_analytic_default/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index eb281c1bd95..8a3ca6c7edf 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/zh_TW.po b/addons/account_analytic_default/i18n/zh_TW.po
index 3c77323635d..2b4479236a9 100644
--- a/addons/account_analytic_default/i18n/zh_TW.po
+++ b/addons/account_analytic_default/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_plans/__terp__.py b/addons/account_analytic_plans/__openerp__.py
similarity index 100%
rename from addons/account_analytic_plans/__terp__.py
rename to addons/account_analytic_plans/__openerp__.py
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 7f1e3854f6a..ea3dbdd0475 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -234,6 +234,9 @@ class account_analytic_plan_instance_line(osv.osv):
         'analytic_account_id':fields.many2one('account.analytic.account','Analytic Account', required=True),
         'rate':fields.float('Rate (%)', required=True),
     }
+    _defaults = {
+        'rate': lambda *args: 100.0
+    }
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
             return []
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index da10d698dfa..55afe582445 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -87,8 +87,8 @@
             <form string="Analytic Distribution">
                 <field name="name" select="1"/>
                 <field name="code" select="1"/>
-                <field name="plan_id" select="2" required="True"/>
-                <field name="journal_id" select="2"/>
+                <field name="plan_id" required="True"/>
+                <field name="journal_id"/>
                 <field name="account_ids" string="Analytic Distribution" colspan="4">
                     <tree string="Analytic Distribution" editable="bottom">
                         <field name="rate"/>
@@ -107,8 +107,8 @@
             <tree string="Analytic Distribution">
                 <field name="name" select="1"/>
                 <field name="code" select="1"/>
-                <field name="plan_id" select="2"/>
-                <field name="journal_id" select="2"/>
+                <field name="plan_id"/>
+                <field name="journal_id"/>
             </tree>
         </field>
     </record>
@@ -222,7 +222,7 @@
             <tree string="Analytic Plan Lines">
                 <field name="name" select="1"/>
                 <field name="sequence"/>
-                <field name="root_analytic_id" select="2"/>
+                <field name="root_analytic_id"/>
                 <field name="min_required"/>
                 <field name="max_required"/>
             </tree>
diff --git a/addons/account_analytic_plans/i18n/ar.po b/addons/account_analytic_plans/i18n/ar.po
index 36cd8b704be..ffe3571c173 100644
--- a/addons/account_analytic_plans/i18n/ar.po
+++ b/addons/account_analytic_plans/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/bg.po b/addons/account_analytic_plans/i18n/bg.po
index f6e89daaf0b..3d7b1fb932f 100644
--- a/addons/account_analytic_plans/i18n/bg.po
+++ b/addons/account_analytic_plans/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/bs.po b/addons/account_analytic_plans/i18n/bs.po
index cb7ab96923b..751e9710f00 100644
--- a/addons/account_analytic_plans/i18n/bs.po
+++ b/addons/account_analytic_plans/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ca.po b/addons/account_analytic_plans/i18n/ca.po
index 2b636eb345f..35adf7eca43 100644
--- a/addons/account_analytic_plans/i18n/ca.po
+++ b/addons/account_analytic_plans/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/cs.po b/addons/account_analytic_plans/i18n/cs.po
index 2d9cfa34cad..ccbdc13a606 100644
--- a/addons/account_analytic_plans/i18n/cs.po
+++ b/addons/account_analytic_plans/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index 1c528accc43..c09bd3037ad 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index 9ab6d570fc9..ecb22ad0305 100644
--- a/addons/account_analytic_plans/i18n/el.po
+++ b/addons/account_analytic_plans/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po
index e7291033c21..fdce7d89b03 100644
--- a/addons/account_analytic_plans/i18n/es.po
+++ b/addons/account_analytic_plans/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-12 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/es_AR.po b/addons/account_analytic_plans/i18n/es_AR.po
index 843c63dcc01..70ebbf3c357 100644
--- a/addons/account_analytic_plans/i18n/es_AR.po
+++ b/addons/account_analytic_plans/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/et.po b/addons/account_analytic_plans/i18n/et.po
index cac38c6e6fd..e6997c748b7 100644
--- a/addons/account_analytic_plans/i18n/et.po
+++ b/addons/account_analytic_plans/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/fi.po b/addons/account_analytic_plans/i18n/fi.po
index 47dd8f7fa48..d50a7dd5dc8 100644
--- a/addons/account_analytic_plans/i18n/fi.po
+++ b/addons/account_analytic_plans/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index a28aacef50d..7051b1a8a51 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/gl.po b/addons/account_analytic_plans/i18n/gl.po
index 6ddb31ed0fb..e4073b80cf8 100644
--- a/addons/account_analytic_plans/i18n/gl.po
+++ b/addons/account_analytic_plans/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/hr.po b/addons/account_analytic_plans/i18n/hr.po
index 0edf3e8fd46..8f75f0dbc8b 100644
--- a/addons/account_analytic_plans/i18n/hr.po
+++ b/addons/account_analytic_plans/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/hu.po b/addons/account_analytic_plans/i18n/hu.po
index 04c38b922cc..f63f5e13c8c 100644
--- a/addons/account_analytic_plans/i18n/hu.po
+++ b/addons/account_analytic_plans/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po
index bc9dc62c17c..778d68ecd7d 100644
--- a/addons/account_analytic_plans/i18n/id.po
+++ b/addons/account_analytic_plans/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index 20fcb8da18e..fc9266c9397 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po
index 6de93149132..82e86a1bc4d 100644
--- a/addons/account_analytic_plans/i18n/ko.po
+++ b/addons/account_analytic_plans/i18n/ko.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: 2009-09-08 14:29+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-04-15 00:46+0000\n"
+"Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -106,7 +106,7 @@ msgstr "배분 코드"
 #. module: account_analytic_plans
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "액션 정의에서 유효하지 않은 모델 이름"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
@@ -116,7 +116,7 @@ msgstr "플랜 이름"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr ""
+msgstr "인쇄 날짜"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -147,7 +147,7 @@ msgstr "분석 저널"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
-msgstr ""
+msgstr "100.00%"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,ref:0
@@ -157,7 +157,7 @@ msgstr "분석 계정 참조"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "분석 계정:"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index d8c0f5b9575..7dda8ed381b 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 73c2ccb1960..fbe88676c9c 100644
--- a/addons/account_analytic_plans/i18n/nl.po
+++ b/addons/account_analytic_plans/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/nl_BE.po b/addons/account_analytic_plans/i18n/nl_BE.po
index a71cbff4b9a..dfce1194d98 100644
--- a/addons/account_analytic_plans/i18n/nl_BE.po
+++ b/addons/account_analytic_plans/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/oc.po b/addons/account_analytic_plans/i18n/oc.po
index 58bff162960..6e1ba6aef2b 100644
--- a/addons/account_analytic_plans/i18n/oc.po
+++ b/addons/account_analytic_plans/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/pl.po b/addons/account_analytic_plans/i18n/pl.po
index 653e35363c0..564ca3b0cd7 100644
--- a/addons/account_analytic_plans/i18n/pl.po
+++ b/addons/account_analytic_plans/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index 27a504b3129..7b17be3392e 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index 99e8b88cb81..b8412237b93 100644
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ro.po b/addons/account_analytic_plans/i18n/ro.po
index fb7691245a6..27a25a216d2 100644
--- a/addons/account_analytic_plans/i18n/ro.po
+++ b/addons/account_analytic_plans/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index 0d988fe9077..b7799af75d0 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/sl.po b/addons/account_analytic_plans/i18n/sl.po
index 35dbf68230c..45423284578 100644
--- a/addons/account_analytic_plans/i18n/sl.po
+++ b/addons/account_analytic_plans/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index 2edc1cb11eb..8c8bb3d0fe4 100644
--- a/addons/account_analytic_plans/i18n/sv.po
+++ b/addons/account_analytic_plans/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tlh.po b/addons/account_analytic_plans/i18n/tlh.po
index 79b051e5499..666ebb52a06 100644
--- a/addons/account_analytic_plans/i18n/tlh.po
+++ b/addons/account_analytic_plans/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+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 391fe90e7f2..67d1bbdd21c 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/uk.po b/addons/account_analytic_plans/i18n/uk.po
index e7fbcaf8ae3..695b0c37ebf 100644
--- a/addons/account_analytic_plans/i18n/uk.po
+++ b/addons/account_analytic_plans/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index b3e917cb6b6..efc721df13e 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/zh_TW.po b/addons/account_analytic_plans/i18n/zh_TW.po
index 908aa96c645..acad2c8ecdf 100644
--- a/addons/account_analytic_plans/i18n/zh_TW.po
+++ b/addons/account_analytic_plans/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_anglo_saxon/__terp__.py b/addons/account_anglo_saxon/__openerp__.py
similarity index 100%
rename from addons/account_anglo_saxon/__terp__.py
rename to addons/account_anglo_saxon/__openerp__.py
diff --git a/addons/account_anglo_saxon/i18n/bg.po b/addons/account_anglo_saxon/i18n/bg.po
index 1463c3fee45..26604ccbf82 100644
--- a/addons/account_anglo_saxon/i18n/bg.po
+++ b/addons/account_anglo_saxon/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po
index eb8abe441ba..f6a07fae485 100644
--- a/addons/account_anglo_saxon/i18n/es.po
+++ b/addons/account_anglo_saxon/i18n/es.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 12:50+0000\n"
-"PO-Revision-Date: 2010-03-24 17:25+0000\n"
-"Last-Translator: relojero <relojero28@gmail.com>\n"
+"PO-Revision-Date: 2010-04-17 21:08+0000\n"
+"Last-Translator: Rodrigo Machado Laprebendere <Unknown>\n"
 "Language-Team: Spanish <es@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-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
@@ -38,16 +38,29 @@ msgid ""
 "    when the invoice is created to transfer this amount to the debtor or "
 "creditor account."
 msgstr ""
+"Éste módulo soportará la metodología de contabilización Anglosajona \n"
+"    cambiando la lógica de contabilización con transacciones de acciones. La "
+"diferencia entre los países de contabilización Anglosajona \n"
+"    y el Rin o también llamados países de contabilización Continental es el "
+"momento de tomar el Costo de Bienes Vendidos contra el Costo de Ventas. \n"
+"    La contabilización Anglosajona toma el costo cuando la factura de ventas "
+"es creada, la contabilización Continental tomará el costo en el momento en "
+"que los bienes son enviados.\n"
+"    Éste módulo agregará esta funcionalidad usando una cuenta provisional, "
+"para almacenar el valor de los bienes enviados y devolverá esta cuenta "
+"provisional \n"
+"    cuando la factura sea creada para transferir esta cantidad al deudor o "
+"acreedor de la cuenta."
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
 msgid "Stock Account"
-msgstr ""
+msgstr "Cuenta de Valores"
 
 #. module: account_anglo_saxon
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "¡XML Inválido para la Arquitectura de la Vista!"
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
diff --git a/addons/account_anglo_saxon/i18n/hi.po b/addons/account_anglo_saxon/i18n/hi.po
index 1d3021be1f9..17533e07772 100644
--- a/addons/account_anglo_saxon/i18n/hi.po
+++ b/addons/account_anglo_saxon/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po
index 4eb9a92a6cc..110a9a1ea09 100644
--- a/addons/account_anglo_saxon/i18n/it.po
+++ b/addons/account_anglo_saxon/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/oc.po b/addons/account_anglo_saxon/i18n/oc.po
index f3872bc73d4..1c0ff1d02ff 100644
--- a/addons/account_anglo_saxon/i18n/oc.po
+++ b/addons/account_anglo_saxon/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po
index c3a4faec267..845f91da872 100644
--- a/addons/account_anglo_saxon/i18n/pl.po
+++ b/addons/account_anglo_saxon/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/sl.po b/addons/account_anglo_saxon/i18n/sl.po
index 515ec04cc07..e80d812f193 100644
--- a/addons/account_anglo_saxon/i18n/sl.po
+++ b/addons/account_anglo_saxon/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index 78e51374128..f744d5084b5 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit.stock</field>
             <field name="model">product.product</field>
@@ -10,8 +10,8 @@
                 <xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
                     <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
                     <newline/>
-<!--	                <field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
-<!--	                <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
+<!--                    <field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
+<!--                    <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
                 </xpath>
             </field>
         </record>
@@ -22,11 +22,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-            	<xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
+                <xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
                     <field name="property_account_creditor_price_difference" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
                     <newline/>
-<!--					<field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
-<!--	                <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
+<!--                    <field name="property_account_sending_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
+<!--                    <field name="property_account_received_goods" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
                 </xpath>
              </field>
         </record>
@@ -41,13 +41,13 @@
                     <group col="2" colspan="2">
                         <separator string=" Accounting Property" colspan="2"/>
                             <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />                        
-<!--					<field name="property_account_sending_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
-<!--	                <field name="property_account_received_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
+<!--                    <field name="property_account_sending_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />-->
+<!--                    <field name="property_account_received_goods_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />-->
                     </group>
                 </form>
             </field>
         </record>
 
-	</data>
+    </data>
 </openerp>
 
diff --git a/addons/account_balance/i18n/ar.po b/addons/account_balance/i18n/ar.po
index 7a1106da540..014ee37c6c9 100644
--- a/addons/account_balance/i18n/ar.po
+++ b/addons/account_balance/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/bg.po b/addons/account_balance/i18n/bg.po
index 34b77ef4e53..450577e76c4 100644
--- a/addons/account_balance/i18n/bg.po
+++ b/addons/account_balance/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/bs.po b/addons/account_balance/i18n/bs.po
index 97260dad8ef..90ca2652ed5 100644
--- a/addons/account_balance/i18n/bs.po
+++ b/addons/account_balance/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/ca.po b/addons/account_balance/i18n/ca.po
index b2d00752323..8a05698ffa9 100644
--- a/addons/account_balance/i18n/ca.po
+++ b/addons/account_balance/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/cs.po b/addons/account_balance/i18n/cs.po
index 6d0b97f64dc..26ada71482c 100644
--- a/addons/account_balance/i18n/cs.po
+++ b/addons/account_balance/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/de.po b/addons/account_balance/i18n/de.po
index 0787b52a6a5..7b6befe6512 100644
--- a/addons/account_balance/i18n/de.po
+++ b/addons/account_balance/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/el.po b/addons/account_balance/i18n/el.po
index 44e80b9ab4d..9c7f4228d3e 100644
--- a/addons/account_balance/i18n/el.po
+++ b/addons/account_balance/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/es.po b/addons/account_balance/i18n/es.po
index 1f252d206dc..f3a7f497ca8 100644
--- a/addons/account_balance/i18n/es.po
+++ b/addons/account_balance/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/es_AR.po b/addons/account_balance/i18n/es_AR.po
index dbec543342d..5126d06f9c1 100644
--- a/addons/account_balance/i18n/es_AR.po
+++ b/addons/account_balance/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/et.po b/addons/account_balance/i18n/et.po
index aca5f45239c..89f9109e506 100644
--- a/addons/account_balance/i18n/et.po
+++ b/addons/account_balance/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/fi.po b/addons/account_balance/i18n/fi.po
index 0d07907afdf..b26ae8ed1c4 100644
--- a/addons/account_balance/i18n/fi.po
+++ b/addons/account_balance/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/fr.po b/addons/account_balance/i18n/fr.po
index d1abec52ef3..58362ac130f 100644
--- a/addons/account_balance/i18n/fr.po
+++ b/addons/account_balance/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/gl.po b/addons/account_balance/i18n/gl.po
index 4ac944d8492..a205fe26221 100644
--- a/addons/account_balance/i18n/gl.po
+++ b/addons/account_balance/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/hr.po b/addons/account_balance/i18n/hr.po
index 94847f587d7..4f9c5532dc2 100644
--- a/addons/account_balance/i18n/hr.po
+++ b/addons/account_balance/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/hu.po b/addons/account_balance/i18n/hu.po
index 728d11ee6c3..014ee37c6c9 100644
--- a/addons/account_balance/i18n/hu.po
+++ b/addons/account_balance/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/id.po b/addons/account_balance/i18n/id.po
index 3c3f81004ff..f997f1f114e 100644
--- a/addons/account_balance/i18n/id.po
+++ b/addons/account_balance/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/it.po b/addons/account_balance/i18n/it.po
index fb0d60fa3cb..cb5dc8802a5 100644
--- a/addons/account_balance/i18n/it.po
+++ b/addons/account_balance/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/ko.po b/addons/account_balance/i18n/ko.po
index 393a9935274..a282552721b 100644
--- a/addons/account_balance/i18n/ko.po
+++ b/addons/account_balance/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/lt.po b/addons/account_balance/i18n/lt.po
index 8bc564f3581..eae3c0a1cc4 100644
--- a/addons/account_balance/i18n/lt.po
+++ b/addons/account_balance/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/nl.po b/addons/account_balance/i18n/nl.po
index 777641395a8..27144e0f171 100644
--- a/addons/account_balance/i18n/nl.po
+++ b/addons/account_balance/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/oc.po b/addons/account_balance/i18n/oc.po
new file mode 100644
index 00000000000..221f387930a
--- /dev/null
+++ b/addons/account_balance/i18n/oc.po
@@ -0,0 +1,288 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-04-16 10:25+0000\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_balance
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account_balance
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Totes los comptes"
+
+#. module: account_balance
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notificacion"
+
+#. module: account_balance
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Periòde Fiscal"
+
+#. module: account_balance
+#: model:ir.actions.report.xml,name:account_balance.account_account_balance
+#: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
+msgid "Account balance"
+msgstr "Balança dels comptes"
+
+#. module: account_balance
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Account Name"
+msgstr "Nom del compte"
+
+#. module: account_balance
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Debit"
+msgstr "Debit"
+
+#. module: account_balance
+#: wizard_button:account.balance.account.balance.report,init,checkyear:0
+msgid "Print"
+msgstr "Estampar"
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account_balance
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Percentatge"
+
+#. module: account_balance
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account_balance
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account_balance
+#: model:ir.actions.wizard,name:account_balance.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account_balance
+#: model:ir.module.module,description:account_balance.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account_balance
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account_balance
+#: help:account.balance.account.balance.report,init,periods:0
+msgid "All periods if empty"
+msgstr ""
+
+#. module: account_balance
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account_balance
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account_balance
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account_balance
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account_balance
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "With movements"
+msgstr ""
+
+#. module: account_balance
+#: wizard_button:account.balance.account.balance.report,backtoinit,end:0
+#: wizard_button:account.balance.account.balance.report,zero_years,end:0
+msgid "Ok"
+msgstr "D'acòrdi"
+
+#. module: account_balance
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Cash"
+msgstr "Liquiditats"
+
+#. module: account_balance
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account_balance
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Afichar los Comptes"
+
+#. module: account_balance
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Credit"
+msgstr "Mercejaments"
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account_balance
+#: model:ir.module.module,shortdesc:account_balance.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account_balance
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account_balance
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Balance"
+msgstr "Balança"
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account_balance
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account_balance
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Data de creacion"
+
+#. module: account_balance
+#: wizard_field:account.balance.account.balance.report,init,fiscalyear:0
+msgid "Fiscal year"
+msgstr "Annada fiscala"
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account_balance
+#: wizard_field:account.balance.account.balance.report,init,periods:0
+msgid "Periods"
+msgstr ""
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
+msgstr ""
+
+#. module: account_balance
+#: wizard_button:account.balance.account.balance.report,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account_balance
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
diff --git a/addons/account_balance/i18n/pl.po b/addons/account_balance/i18n/pl.po
index 762397b070c..8498b634a61 100644
--- a/addons/account_balance/i18n/pl.po
+++ b/addons/account_balance/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/pt.po b/addons/account_balance/i18n/pt.po
index 0230abb2085..2e0413de031 100644
--- a/addons/account_balance/i18n/pt.po
+++ b/addons/account_balance/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/pt_BR.po b/addons/account_balance/i18n/pt_BR.po
index eafa265f751..fefa28a1bcc 100644
--- a/addons/account_balance/i18n/pt_BR.po
+++ b/addons/account_balance/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/ro.po b/addons/account_balance/i18n/ro.po
index 9c229349487..2ce20389cc0 100644
--- a/addons/account_balance/i18n/ro.po
+++ b/addons/account_balance/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/ru.po b/addons/account_balance/i18n/ru.po
index be5a6180a67..7355b366850 100644
--- a/addons/account_balance/i18n/ru.po
+++ b/addons/account_balance/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/sl.po b/addons/account_balance/i18n/sl.po
index 7894ca04f40..c73e44fd080 100644
--- a/addons/account_balance/i18n/sl.po
+++ b/addons/account_balance/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/sv.po b/addons/account_balance/i18n/sv.po
index 728d11ee6c3..014ee37c6c9 100644
--- a/addons/account_balance/i18n/sv.po
+++ b/addons/account_balance/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/tlh.po b/addons/account_balance/i18n/tlh.po
index 6f2f14a111a..43f10e97f76 100644
--- a/addons/account_balance/i18n/tlh.po
+++ b/addons/account_balance/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/tr.po b/addons/account_balance/i18n/tr.po
index d1ce9c420b8..d13747336ef 100644
--- a/addons/account_balance/i18n/tr.po
+++ b/addons/account_balance/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/uk.po b/addons/account_balance/i18n/uk.po
index efc8335fa53..7c7896ec518 100644
--- a/addons/account_balance/i18n/uk.po
+++ b/addons/account_balance/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/zh_CN.po b/addons/account_balance/i18n/zh_CN.po
index d920da595a7..36311c0b008 100644
--- a/addons/account_balance/i18n/zh_CN.po
+++ b/addons/account_balance/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_balance/i18n/zh_TW.po b/addons/account_balance/i18n/zh_TW.po
index a7d03782f30..56108876486 100644
--- a/addons/account_balance/i18n/zh_TW.po
+++ b/addons/account_balance/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_budget/__terp__.py b/addons/account_budget/__openerp__.py
similarity index 100%
rename from addons/account_budget/__terp__.py
rename to addons/account_budget/__openerp__.py
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 063594553e3..56008013075 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -70,7 +70,7 @@
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
                     <field name="company_id"  groups="base.group_multi_company"/>
-                    <field name="sequence" select="2"/>
+                    <field name="sequence"/>
                     <notebook colspan="4">
                         <page string="Accounts">
                             <field name="account_ids" colspan="4" nolabel="1"/>
@@ -127,8 +127,8 @@
                             <field name="code" colspan="1" select="1" />
                             <field name="creating_user_id" />
                             <field name="validating_user_id" readonly="True"/>
-                            <field name="date_from" select="2"/>
-                            <field name="date_to" select="2"/>
+                            <field name="date_from"/>
+                            <field name="date_to"/>
                             <field name="crossovered_budget_line" colspan="4" nolabel="1">
                                 <tree string="Budget Lines">
                                     <field name="analytic_account_id"/>
@@ -294,9 +294,9 @@
             auto="False"
             menu="False"/>-->
 
-		<!--Menu for project management-->
-		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
-		<menuitem id="base.menu_pm_invoicing" name="Invoicing" parent="base.menu_main_pm" sequence="7"/>
+        <!--Menu for project management-->
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem id="base.menu_pm_invoicing" name="Billing" parent="base.menu_main_pm" sequence="7"/>
         <menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
         <menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
         <menuitem parent="menu_pm_budget"
diff --git a/addons/account_budget/i18n/ar.po b/addons/account_budget/i18n/ar.po
index 13e014fa41b..c2e1f0214c7 100644
--- a/addons/account_budget/i18n/ar.po
+++ b/addons/account_budget/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/bg.po b/addons/account_budget/i18n/bg.po
index 36d9ed3df15..126a86ddfdb 100644
--- a/addons/account_budget/i18n/bg.po
+++ b/addons/account_budget/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/bs.po b/addons/account_budget/i18n/bs.po
index 6d7b0aa01ed..3b4b56962b5 100644
--- a/addons/account_budget/i18n/bs.po
+++ b/addons/account_budget/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/ca.po b/addons/account_budget/i18n/ca.po
index d4d5b688744..42ec3510a0a 100644
--- a/addons/account_budget/i18n/ca.po
+++ b/addons/account_budget/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/cs.po b/addons/account_budget/i18n/cs.po
index ba153d3feae..0e22fa87380 100644
--- a/addons/account_budget/i18n/cs.po
+++ b/addons/account_budget/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index 1ced39aad5f..2f3c8eb2d9f 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po
index 4f379b2d3fe..3dc3302c6ea 100644
--- a/addons/account_budget/i18n/el.po
+++ b/addons/account_budget/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index da0c05f86c2..7148bcb50f2 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/es_AR.po b/addons/account_budget/i18n/es_AR.po
index ff5f1299d7b..d5100ba67ab 100644
--- a/addons/account_budget/i18n/es_AR.po
+++ b/addons/account_budget/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/et.po b/addons/account_budget/i18n/et.po
index 0a5ae3e1f6b..cf5b1535109 100644
--- a/addons/account_budget/i18n/et.po
+++ b/addons/account_budget/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/fi.po b/addons/account_budget/i18n/fi.po
index 0b49a6a905a..b382dd1b5cd 100644
--- a/addons/account_budget/i18n/fi.po
+++ b/addons/account_budget/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index 078668f383f..6ce6f058970 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/gl.po b/addons/account_budget/i18n/gl.po
index 90c9ab61481..6bd435dffc9 100644
--- a/addons/account_budget/i18n/gl.po
+++ b/addons/account_budget/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/hi.po b/addons/account_budget/i18n/hi.po
index d33bd3d0978..37c13ae489c 100644
--- a/addons/account_budget/i18n/hi.po
+++ b/addons/account_budget/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/hr.po b/addons/account_budget/i18n/hr.po
index 00a33e424b6..38f6af8abc4 100644
--- a/addons/account_budget/i18n/hr.po
+++ b/addons/account_budget/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/hu.po b/addons/account_budget/i18n/hu.po
index 856617c1587..c5063dc2873 100644
--- a/addons/account_budget/i18n/hu.po
+++ b/addons/account_budget/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index 9047fa4ac15..34ed713c9c3 100644
--- a/addons/account_budget/i18n/id.po
+++ b/addons/account_budget/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index d122cf21762..a82e95f6eb1 100644
--- a/addons/account_budget/i18n/it.po
+++ b/addons/account_budget/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/ko.po b/addons/account_budget/i18n/ko.po
index 97a4c8dfd54..f5347f57b8b 100644
--- a/addons/account_budget/i18n/ko.po
+++ b/addons/account_budget/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index c52662f648c..a28c1346c85 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index 67ba7f23e74..140df36902c 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/nl_BE.po b/addons/account_budget/i18n/nl_BE.po
index 6c999cad1c4..e13829858a9 100644
--- a/addons/account_budget/i18n/nl_BE.po
+++ b/addons/account_budget/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/pl.po b/addons/account_budget/i18n/pl.po
index 5371eb2e5f2..8be9edc8661 100644
--- a/addons/account_budget/i18n/pl.po
+++ b/addons/account_budget/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index 80cf845a641..622ab576ce6 100644
--- a/addons/account_budget/i18n/pt.po
+++ b/addons/account_budget/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po
index d7fe5464537..1d708725a28 100644
--- a/addons/account_budget/i18n/pt_BR.po
+++ b/addons/account_budget/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/ro.po b/addons/account_budget/i18n/ro.po
index cd3c7f8b1d7..edca0ed70ad 100644
--- a/addons/account_budget/i18n/ro.po
+++ b/addons/account_budget/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index c29692ad115..3ad8a9106bf 100644
--- a/addons/account_budget/i18n/ru.po
+++ b/addons/account_budget/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/sl.po b/addons/account_budget/i18n/sl.po
index 309b9597ea1..e130761e476 100644
--- a/addons/account_budget/i18n/sl.po
+++ b/addons/account_budget/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index dcf557c50d8..5ccc444bf59 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/tlh.po b/addons/account_budget/i18n/tlh.po
index 046ec1654a6..1595efe947e 100644
--- a/addons/account_budget/i18n/tlh.po
+++ b/addons/account_budget/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+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 4f893f19895..e8c9d9413a5 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/uk.po b/addons/account_budget/i18n/uk.po
index 1b457b7549c..d48a877df78 100644
--- a/addons/account_budget/i18n/uk.po
+++ b/addons/account_budget/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index a35420ee2f2..d3035357424 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/zh_TW.po b/addons/account_budget/i18n/zh_TW.po
index d02488227e6..fbb06198304 100644
--- a/addons/account_budget/i18n/zh_TW.po
+++ b/addons/account_budget/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_chart/__terp__.py b/addons/account_chart/__openerp__.py
similarity index 100%
rename from addons/account_chart/__terp__.py
rename to addons/account_chart/__openerp__.py
diff --git a/addons/account_chart/i18n/ar.po b/addons/account_chart/i18n/ar.po
index eaa300a9762..d482a70a55e 100644
--- a/addons/account_chart/i18n/ar.po
+++ b/addons/account_chart/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/bg.po b/addons/account_chart/i18n/bg.po
index 09a4e57d2f5..2481e12a072 100644
--- a/addons/account_chart/i18n/bg.po
+++ b/addons/account_chart/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/bs.po b/addons/account_chart/i18n/bs.po
index 017a0ea29f9..e98090f7d58 100644
--- a/addons/account_chart/i18n/bs.po
+++ b/addons/account_chart/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/ca.po b/addons/account_chart/i18n/ca.po
index 283e2b63910..cc673970508 100644
--- a/addons/account_chart/i18n/ca.po
+++ b/addons/account_chart/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/cs.po b/addons/account_chart/i18n/cs.po
index bb74bca7305..1a5b225ef32 100644
--- a/addons/account_chart/i18n/cs.po
+++ b/addons/account_chart/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/da.po b/addons/account_chart/i18n/da.po
index 28832159be8..0abcb14b2f9 100644
--- a/addons/account_chart/i18n/da.po
+++ b/addons/account_chart/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/de.po b/addons/account_chart/i18n/de.po
index 6a71e089125..fdc72fd9b84 100644
--- a/addons/account_chart/i18n/de.po
+++ b/addons/account_chart/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/el.po b/addons/account_chart/i18n/el.po
index 18ade051d36..035e9ce99d4 100644
--- a/addons/account_chart/i18n/el.po
+++ b/addons/account_chart/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/es.po b/addons/account_chart/i18n/es.po
index 056e15cfe15..7f6f8059b41 100644
--- a/addons/account_chart/i18n/es.po
+++ b/addons/account_chart/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/es_AR.po b/addons/account_chart/i18n/es_AR.po
index c60181a6691..059d5b10432 100644
--- a/addons/account_chart/i18n/es_AR.po
+++ b/addons/account_chart/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/et.po b/addons/account_chart/i18n/et.po
index c8caf7a0584..0cb9ffc4248 100644
--- a/addons/account_chart/i18n/et.po
+++ b/addons/account_chart/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/fi.po b/addons/account_chart/i18n/fi.po
index fc5b32068ae..bed67685219 100644
--- a/addons/account_chart/i18n/fi.po
+++ b/addons/account_chart/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/fr.po b/addons/account_chart/i18n/fr.po
index 222b88ff17b..689f7d0e6e6 100644
--- a/addons/account_chart/i18n/fr.po
+++ b/addons/account_chart/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/gl.po b/addons/account_chart/i18n/gl.po
index cf914678286..07c5bf7347a 100644
--- a/addons/account_chart/i18n/gl.po
+++ b/addons/account_chart/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/hi.po b/addons/account_chart/i18n/hi.po
index 0d4c2653df3..3cb1f2feeb8 100644
--- a/addons/account_chart/i18n/hi.po
+++ b/addons/account_chart/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/hr.po b/addons/account_chart/i18n/hr.po
index 65b39d1ac80..ab32e7bee5d 100644
--- a/addons/account_chart/i18n/hr.po
+++ b/addons/account_chart/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/hu.po b/addons/account_chart/i18n/hu.po
index eaa300a9762..d482a70a55e 100644
--- a/addons/account_chart/i18n/hu.po
+++ b/addons/account_chart/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po
index e2115b8a5f2..ebc6cfb3d7b 100644
--- a/addons/account_chart/i18n/id.po
+++ b/addons/account_chart/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/it.po b/addons/account_chart/i18n/it.po
index c351d7f2b32..17a8eb7adf5 100644
--- a/addons/account_chart/i18n/it.po
+++ b/addons/account_chart/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/ko.po b/addons/account_chart/i18n/ko.po
index 181d0c85b7c..65bf7ea6d68 100644
--- a/addons/account_chart/i18n/ko.po
+++ b/addons/account_chart/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/lt.po b/addons/account_chart/i18n/lt.po
index 0770eb83f0b..b709b8cc4e3 100644
--- a/addons/account_chart/i18n/lt.po
+++ b/addons/account_chart/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/lv.po b/addons/account_chart/i18n/lv.po
index 79eb5052507..a510f16df69 100644
--- a/addons/account_chart/i18n/lv.po
+++ b/addons/account_chart/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/nb.po b/addons/account_chart/i18n/nb.po
index 7fa8ef7e7d7..91383b8a09d 100644
--- a/addons/account_chart/i18n/nb.po
+++ b/addons/account_chart/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/nl.po b/addons/account_chart/i18n/nl.po
index 2ba03eeaa1f..4e930788534 100644
--- a/addons/account_chart/i18n/nl.po
+++ b/addons/account_chart/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/nl_BE.po b/addons/account_chart/i18n/nl_BE.po
index 2a0eddddfcc..12a26ac2871 100644
--- a/addons/account_chart/i18n/nl_BE.po
+++ b/addons/account_chart/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/oc.po b/addons/account_chart/i18n/oc.po
index 8230730d802..857f4142c1e 100644
--- a/addons/account_chart/i18n/oc.po
+++ b/addons/account_chart/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/pl.po b/addons/account_chart/i18n/pl.po
index d5b1059e13f..438d7af7ff6 100644
--- a/addons/account_chart/i18n/pl.po
+++ b/addons/account_chart/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/pt.po b/addons/account_chart/i18n/pt.po
index 2cc5553e7f6..d3efb228d7e 100644
--- a/addons/account_chart/i18n/pt.po
+++ b/addons/account_chart/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/pt_BR.po b/addons/account_chart/i18n/pt_BR.po
index a1aa8bd5558..b4d3c77f454 100644
--- a/addons/account_chart/i18n/pt_BR.po
+++ b/addons/account_chart/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/ro.po b/addons/account_chart/i18n/ro.po
index 7ec977fad7c..a5fdc7af609 100644
--- a/addons/account_chart/i18n/ro.po
+++ b/addons/account_chart/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/ru.po b/addons/account_chart/i18n/ru.po
index 519eb416a3b..f596698ade7 100644
--- a/addons/account_chart/i18n/ru.po
+++ b/addons/account_chart/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/sk.po b/addons/account_chart/i18n/sk.po
index 9c01a07d114..240d0b4b4b1 100644
--- a/addons/account_chart/i18n/sk.po
+++ b/addons/account_chart/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/sl.po b/addons/account_chart/i18n/sl.po
index c13aa8731ec..ab553bd91c0 100644
--- a/addons/account_chart/i18n/sl.po
+++ b/addons/account_chart/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/sr.po b/addons/account_chart/i18n/sr.po
index d7c2b20dccc..a3b6207d2d2 100644
--- a/addons/account_chart/i18n/sr.po
+++ b/addons/account_chart/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/sv.po b/addons/account_chart/i18n/sv.po
index fbf4c72a770..5aedbd9ee83 100644
--- a/addons/account_chart/i18n/sv.po
+++ b/addons/account_chart/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/tr.po b/addons/account_chart/i18n/tr.po
index f05f1a51a04..04c061b73fe 100644
--- a/addons/account_chart/i18n/tr.po
+++ b/addons/account_chart/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/uk.po b/addons/account_chart/i18n/uk.po
index 0cac882d308..a3c41a72552 100644
--- a/addons/account_chart/i18n/uk.po
+++ b/addons/account_chart/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/zh_CN.po b/addons/account_chart/i18n/zh_CN.po
index 41a1b6c0b2a..2d95eaf0df1 100644
--- a/addons/account_chart/i18n/zh_CN.po
+++ b/addons/account_chart/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/zh_TW.po b/addons/account_chart/i18n/zh_TW.po
index eaa300a9762..d482a70a55e 100644
--- a/addons/account_chart/i18n/zh_TW.po
+++ b/addons/account_chart/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_date_check/__terp__.py b/addons/account_date_check/__openerp__.py
similarity index 100%
rename from addons/account_date_check/__terp__.py
rename to addons/account_date_check/__openerp__.py
diff --git a/addons/account_date_check/i18n/ar.po b/addons/account_date_check/i18n/ar.po
index a7a02e11712..6a3e8558bf6 100644
--- a/addons/account_date_check/i18n/ar.po
+++ b/addons/account_date_check/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/bg.po b/addons/account_date_check/i18n/bg.po
index e16bad3b7d4..e831bf0b3e7 100644
--- a/addons/account_date_check/i18n/bg.po
+++ b/addons/account_date_check/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/bs.po b/addons/account_date_check/i18n/bs.po
index a846146d12b..7b1a70ae36e 100644
--- a/addons/account_date_check/i18n/bs.po
+++ b/addons/account_date_check/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/ca.po b/addons/account_date_check/i18n/ca.po
index aef874dc6cb..80d27991939 100644
--- a/addons/account_date_check/i18n/ca.po
+++ b/addons/account_date_check/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/cs.po b/addons/account_date_check/i18n/cs.po
index ca30b6a1ff1..023cca0d173 100644
--- a/addons/account_date_check/i18n/cs.po
+++ b/addons/account_date_check/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/da.po b/addons/account_date_check/i18n/da.po
index 66a5b68d4e5..f1a046dad49 100644
--- a/addons/account_date_check/i18n/da.po
+++ b/addons/account_date_check/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/de.po b/addons/account_date_check/i18n/de.po
index d3c83fc361c..fec72b6a41c 100644
--- a/addons/account_date_check/i18n/de.po
+++ b/addons/account_date_check/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/el.po b/addons/account_date_check/i18n/el.po
index 4c37875f3c1..c5c3359f06f 100644
--- a/addons/account_date_check/i18n/el.po
+++ b/addons/account_date_check/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/es.po b/addons/account_date_check/i18n/es.po
index 2ffffbba92f..02fbaa7770b 100644
--- a/addons/account_date_check/i18n/es.po
+++ b/addons/account_date_check/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/es_AR.po b/addons/account_date_check/i18n/es_AR.po
index f74c0556303..ea4bc864107 100644
--- a/addons/account_date_check/i18n/es_AR.po
+++ b/addons/account_date_check/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/et.po b/addons/account_date_check/i18n/et.po
index 2e351b5dd1e..c78c2575d74 100644
--- a/addons/account_date_check/i18n/et.po
+++ b/addons/account_date_check/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/fi.po b/addons/account_date_check/i18n/fi.po
index 21d66c24962..8bbcb3780b7 100644
--- a/addons/account_date_check/i18n/fi.po
+++ b/addons/account_date_check/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/fr.po b/addons/account_date_check/i18n/fr.po
index 673ac7f58f7..d8fe4bc69e3 100644
--- a/addons/account_date_check/i18n/fr.po
+++ b/addons/account_date_check/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/gl.po b/addons/account_date_check/i18n/gl.po
index 76656bf270e..76c48de5db4 100644
--- a/addons/account_date_check/i18n/gl.po
+++ b/addons/account_date_check/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/hr.po b/addons/account_date_check/i18n/hr.po
index d8f44fc380a..ce6376c640a 100644
--- a/addons/account_date_check/i18n/hr.po
+++ b/addons/account_date_check/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/hu.po b/addons/account_date_check/i18n/hu.po
index a7a02e11712..6a3e8558bf6 100644
--- a/addons/account_date_check/i18n/hu.po
+++ b/addons/account_date_check/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/id.po b/addons/account_date_check/i18n/id.po
index 4f14ad764c9..0caa8f85203 100644
--- a/addons/account_date_check/i18n/id.po
+++ b/addons/account_date_check/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/it.po b/addons/account_date_check/i18n/it.po
index 8d844595cd9..e19de2306cf 100644
--- a/addons/account_date_check/i18n/it.po
+++ b/addons/account_date_check/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/ko.po b/addons/account_date_check/i18n/ko.po
index 2686d1b6469..f3821065400 100644
--- a/addons/account_date_check/i18n/ko.po
+++ b/addons/account_date_check/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/lt.po b/addons/account_date_check/i18n/lt.po
index be238d31d4e..d497815a537 100644
--- a/addons/account_date_check/i18n/lt.po
+++ b/addons/account_date_check/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/nl.po b/addons/account_date_check/i18n/nl.po
index 1e8ca9ed8e1..05a36e01bee 100644
--- a/addons/account_date_check/i18n/nl.po
+++ b/addons/account_date_check/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/nl_BE.po b/addons/account_date_check/i18n/nl_BE.po
index b87cbeecdce..5b154b7e35b 100644
--- a/addons/account_date_check/i18n/nl_BE.po
+++ b/addons/account_date_check/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/oc.po b/addons/account_date_check/i18n/oc.po
index 984f4f1a24a..bcfe577ea1c 100644
--- a/addons/account_date_check/i18n/oc.po
+++ b/addons/account_date_check/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/pl.po b/addons/account_date_check/i18n/pl.po
index 0a331b47522..7b6a9bf8d98 100644
--- a/addons/account_date_check/i18n/pl.po
+++ b/addons/account_date_check/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/pt.po b/addons/account_date_check/i18n/pt.po
index 1afa1470827..8659b61f04b 100644
--- a/addons/account_date_check/i18n/pt.po
+++ b/addons/account_date_check/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/pt_BR.po b/addons/account_date_check/i18n/pt_BR.po
index 99d11dd8177..867db1ed4f5 100644
--- a/addons/account_date_check/i18n/pt_BR.po
+++ b/addons/account_date_check/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/ro.po b/addons/account_date_check/i18n/ro.po
index 58d576188cb..7f44826f88c 100644
--- a/addons/account_date_check/i18n/ro.po
+++ b/addons/account_date_check/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/ru.po b/addons/account_date_check/i18n/ru.po
index fb86de74ceb..220e97c3fe2 100644
--- a/addons/account_date_check/i18n/ru.po
+++ b/addons/account_date_check/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/sk.po b/addons/account_date_check/i18n/sk.po
index 4c4ab4bc724..6976446d162 100644
--- a/addons/account_date_check/i18n/sk.po
+++ b/addons/account_date_check/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/sl.po b/addons/account_date_check/i18n/sl.po
index 51a12d17a87..1454a94f54d 100644
--- a/addons/account_date_check/i18n/sl.po
+++ b/addons/account_date_check/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/sv.po b/addons/account_date_check/i18n/sv.po
index bf47370e2c6..b74cce8e88b 100644
--- a/addons/account_date_check/i18n/sv.po
+++ b/addons/account_date_check/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/tlh.po b/addons/account_date_check/i18n/tlh.po
index 14ebd73efc3..0dbad9f2719 100644
--- a/addons/account_date_check/i18n/tlh.po
+++ b/addons/account_date_check/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/tr.po b/addons/account_date_check/i18n/tr.po
index 69f2a69359c..63e1dd2e2ef 100644
--- a/addons/account_date_check/i18n/tr.po
+++ b/addons/account_date_check/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/uk.po b/addons/account_date_check/i18n/uk.po
index 234481b3170..109d9c1a548 100644
--- a/addons/account_date_check/i18n/uk.po
+++ b/addons/account_date_check/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/zh_CN.po b/addons/account_date_check/i18n/zh_CN.po
index 9822ef5572f..e47049bbfa0 100644
--- a/addons/account_date_check/i18n/zh_CN.po
+++ b/addons/account_date_check/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_date_check/i18n/zh_TW.po b/addons/account_date_check/i18n/zh_TW.po
index e6ca8e68944..516cddc9f3c 100644
--- a/addons/account_date_check/i18n/zh_TW.po
+++ b/addons/account_date_check/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__openerp__.py
similarity index 100%
rename from addons/account_followup/__terp__.py
rename to addons/account_followup/__openerp__.py
diff --git a/addons/account_followup/followup_report_view.xml b/addons/account_followup/followup_report_view.xml
index 54af019192b..71780a4d05a 100644
--- a/addons/account_followup/followup_report_view.xml
+++ b/addons/account_followup/followup_report_view.xml
@@ -9,12 +9,12 @@
             <field name="arch" type="xml">
                 <form string="Follow-Up lines">
                     <field name="name" select="1"/>
-                    <field name="account_type" select="2"/>
+                    <field name="account_type"/>
                     <field name="date_move" select="1"/>
                     <field name="date_move_last" select="1"/>
-                    <field name="date_followup" select="2"/>
-                    <field name="followup_id" select="2"/>
-                    <field name="balance" select="2"/>
+                    <field name="date_followup"/>
+                    <field name="followup_id"/>
+                    <field name="balance"/>
                     <field name="debit"/>
                     <field name="credit"/>
                 </form>
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index 841ce2c9f18..4b5e77beb87 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -135,16 +135,16 @@
         <menuitem action="act_account_partner_account_move_payable_all" id="menu_account_move_open_unreconcile_payable" parent="account_followup.menu_action_followup_stat"/>
         
         <record model="ir.ui.view" id="view_company_inherit_followup_form">
-			<field name="name">res.company.followup.form.inherit</field>
-			<field name="inherit_id" ref="account.view_company_inherit_form"/>
-			<field name="model">res.company</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-            	<field name="overdue_msg" nolabel="1" colspan ="4" position="after">
-            	    <separator string="Follow-up Message" colspan="4"/>
+            <field name="name">res.company.followup.form.inherit</field>
+            <field name="inherit_id" ref="account.view_company_inherit_form"/>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="overdue_msg" nolabel="1" colspan ="4" position="after">
+                    <separator string="Follow-up Message" colspan="4"/>
                     <field name="follow_up_msg" nolabel="1" colspan ="4"/>
                 </field>
             </field>
-		</record>
+        </record>
     </data>
 </openerp>
diff --git a/addons/account_followup/i18n/ar.po b/addons/account_followup/i18n/ar.po
index 94dd52e0513..edbb74b012d 100644
--- a/addons/account_followup/i18n/ar.po
+++ b/addons/account_followup/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/bg.po b/addons/account_followup/i18n/bg.po
index 7cdfd7c2bd9..5e3c0758559 100644
--- a/addons/account_followup/i18n/bg.po
+++ b/addons/account_followup/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/bs.po b/addons/account_followup/i18n/bs.po
index 4c5e89364e0..a790e3c5d70 100644
--- a/addons/account_followup/i18n/bs.po
+++ b/addons/account_followup/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/ca.po b/addons/account_followup/i18n/ca.po
index 597962ae488..86e7e4b2d60 100644
--- a/addons/account_followup/i18n/ca.po
+++ b/addons/account_followup/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/cs.po b/addons/account_followup/i18n/cs.po
index 94dd52e0513..edbb74b012d 100644
--- a/addons/account_followup/i18n/cs.po
+++ b/addons/account_followup/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index 22e9addf58a..3388305a408 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/el.po b/addons/account_followup/i18n/el.po
index da16bb4eac3..a3c678a2eec 100644
--- a/addons/account_followup/i18n/el.po
+++ b/addons/account_followup/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index ac5bf792881..19087830a14 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/es_AR.po b/addons/account_followup/i18n/es_AR.po
index d669e28eb4f..7723eb664e8 100644
--- a/addons/account_followup/i18n/es_AR.po
+++ b/addons/account_followup/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/et.po b/addons/account_followup/i18n/et.po
index e76f8f06536..ca458db1728 100644
--- a/addons/account_followup/i18n/et.po
+++ b/addons/account_followup/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/fi.po b/addons/account_followup/i18n/fi.po
index ab35aafeaaa..d75c3a435a0 100644
--- a/addons/account_followup/i18n/fi.po
+++ b/addons/account_followup/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 3404cc24f60..bd63eab7f10 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 1e1d4980536..45fce2cbd2b 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/hu.po b/addons/account_followup/i18n/hu.po
index 94dd52e0513..edbb74b012d 100644
--- a/addons/account_followup/i18n/hu.po
+++ b/addons/account_followup/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/id.po b/addons/account_followup/i18n/id.po
index 4f60a06b80a..f73b62edf8c 100644
--- a/addons/account_followup/i18n/id.po
+++ b/addons/account_followup/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/it.po b/addons/account_followup/i18n/it.po
index e85a81a35d5..9d72804a8be 100644
--- a/addons/account_followup/i18n/it.po
+++ b/addons/account_followup/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/ko.po b/addons/account_followup/i18n/ko.po
index 173d7f72e4d..2e9f5e8d932 100644
--- a/addons/account_followup/i18n/ko.po
+++ b/addons/account_followup/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index cfe7f5331c4..c598cc86067 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 1a7ca5938d0..1a2df4e5a33 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po
index 55f5c135e31..c857b8b84b6 100644
--- a/addons/account_followup/i18n/nl_BE.po
+++ b/addons/account_followup/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/oc.po b/addons/account_followup/i18n/oc.po
new file mode 100644
index 00000000000..7db5e861ed2
--- /dev/null
+++ b/addons/account_followup/i18n/oc.po
@@ -0,0 +1,496 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-04-17 09:13+0000\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Date :"
+msgstr "Data :"
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,next,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Customer Ref :"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
+#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
+msgid "All payable entries"
+msgstr ""
+
+#. module: account_followup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_followup
+#: field:account_followup.followup.line,description:0
+msgid "Printed Message"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Amount In Currency"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Due"
+msgstr "Tèrme"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Debit total"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(user_signature)s: User name"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Select partners"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,followup_line:0
+msgid "Follow-Up"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,debit:0
+msgid "Debit"
+msgstr "Debit"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Email Settings"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,account_type:0
+msgid "Account Type"
+msgstr "Tipe de compte"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Ref"
+msgstr "Ref."
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(followup_amount)s: Total Amount Due"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(date)s: Current Date"
+msgstr ""
+
+#. module: account_followup
+#: field:account.move.line,followup_date:0
+msgid "Latest Follow-up"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup.line,followup_id:0
+#: field:account_followup.stat,followup_id:0
+msgid "Follow Ups"
+msgstr ""
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,init,date:0
+msgid "Follow-up Sending Date"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,description:0
+#: rml:account_followup.followup.print:0
+msgid "Description"
+msgstr "Descripcion"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Balance:"
+msgstr "Balança :"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.followup,company_id:0
+msgid "Company"
+msgstr "Entrepresa"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,next,email_subject:0
+msgid "Email Subject"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Paid"
+msgstr "Pagat"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(line)s: Account Move lines"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,date_followup:0
+msgid "Latest followup"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Partner entries"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup_line
+msgid "Follow-Ups Criteria"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Partner Selection"
+msgstr ""
+
+#. module: account_followup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_followup
+#: field:account_followup.followup.line,start:0
+msgid "Type of Term"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,init:0
+msgid "Follow-up and Date Selection"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Select partners to remind"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Li."
+msgstr "Lit."
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount staid unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+"\t\t\t"
+msgstr ""
+
+#. module: account_followup
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,summary,end:0
+msgid "Ok"
+msgstr "D'acòrdi"
+
+#. module: account_followup
+#: field:account_followup.followup,name:0
+#: field:account_followup.followup.line,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move:0
+msgid "First move"
+msgstr ""
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "End of Month"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(company_name)s: User's Company name"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
+#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile
+msgid "All receivable entries"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Lines"
+msgstr "Linhas"
+
+#. module: account_followup
+#: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
+#: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu
+msgid "Send followups"
+msgstr ""
+
+#. module: account_followup
+#: field:account.move.line,followup_line_id:0
+msgid "Follow-up Level"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Credit"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat
+msgid "Followup statistics"
+msgstr ""
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,init,next:0
+msgid "Continue"
+msgstr "Contunhar"
+
+#. module: account_followup
+#: model:ir.module.module,shortdesc:account_followup.module_meta_information
+msgid "Accounting follow-ups management"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,summary:0
+#: wizard_field:account_followup.followup.print.all,summary,summary:0
+msgid "Summary"
+msgstr "Resumit"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "Follow-Up Lines"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Document : Customer account statement"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Follow-Up lines"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(company_currency)s: User's Company Currency"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,balance:0
+msgid "Balance"
+msgstr "Balança"
+
+#. module: account_followup
+#: help:account_followup.followup.print.all,init,date:0
+msgid ""
+"This field allow you to select a forecast date to plan your follow-ups"
+msgstr ""
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Credit total"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+"we can resolve the matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+"\t\t\t"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Sub-Total:"
+msgstr ""
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "Net Days"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
+#: model:ir.actions.act_window,name:account_followup.action_followup_stat
+#: model:ir.model,name:account_followup.model_account_followup_followup
+#: model:ir.ui.menu,name:account_followup.account_followup_menu
+#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat
+msgid "Follow-Ups"
+msgstr ""
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+#: wizard_field:account_followup.followup.print.all,next,email_body:0
+msgid "Email body"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,date_move_last:0
+msgid "Last move"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account_followup
+#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
+msgid "Followup Report"
+msgstr ""
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days , then legal action for the "
+"recovery of the debt, will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+"\t\t\t"
+msgstr ""
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Legend"
+msgstr "Legenda"
+
+#. module: account_followup
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(heading)s: Move line header"
+msgstr ""
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(partner_name)s: Partner name"
+msgstr ""
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,next,email_conf:0
+msgid "Send email confirmation"
+msgstr ""
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,init,followup_id:0
+msgid "Follow-up"
+msgstr ""
+
+#. module: account_followup
+#: field:account_followup.stat,name:0
+msgid "Partner"
+msgstr "Partenari"
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,init,end:0
+#: wizard_button:account_followup.followup.print.all,next,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_followup
+#: field:account_followup.followup.line,delay:0
+msgid "Days of delay"
+msgstr ""
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,next,print:0
+msgid "Print Follow Ups & Send Mails"
+msgstr ""
diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po
index c5dc703649d..ba638c1a30d 100644
--- a/addons/account_followup/i18n/pl.po
+++ b/addons/account_followup/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index 0b83cee8e24..7246ad73a2e 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po
index 25206af21ce..ba57d8b18a3 100644
--- a/addons/account_followup/i18n/pt_BR.po
+++ b/addons/account_followup/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/ro.po b/addons/account_followup/i18n/ro.po
index 017f1f377ee..b666adc0b0a 100644
--- a/addons/account_followup/i18n/ro.po
+++ b/addons/account_followup/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po
index 021ebf2ba21..1168e71d478 100644
--- a/addons/account_followup/i18n/ru.po
+++ b/addons/account_followup/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/sl.po b/addons/account_followup/i18n/sl.po
index d9770d8ee51..af54958db30 100644
--- a/addons/account_followup/i18n/sl.po
+++ b/addons/account_followup/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po
index f1dd4ee3e74..462caad4d6b 100644
--- a/addons/account_followup/i18n/sv.po
+++ b/addons/account_followup/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/tlh.po b/addons/account_followup/i18n/tlh.po
index b91adfcfaa9..fbad7490756 100644
--- a/addons/account_followup/i18n/tlh.po
+++ b/addons/account_followup/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+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 6154f02f758..504bf6adfe9 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/uk.po b/addons/account_followup/i18n/uk.po
index 6c9f48ed296..86737156115 100644
--- a/addons/account_followup/i18n/uk.po
+++ b/addons/account_followup/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index 72495407627..6927cc88514 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/zh_TW.po b/addons/account_followup/i18n/zh_TW.po
index 9695334e432..bffc29276ff 100644
--- a/addons/account_followup/i18n/zh_TW.po
+++ b/addons/account_followup/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_invoice_layout/__terp__.py b/addons/account_invoice_layout/__openerp__.py
similarity index 100%
rename from addons/account_invoice_layout/__terp__.py
rename to addons/account_invoice_layout/__openerp__.py
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index fe11e407bf3..930ab044eb6 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -1,92 +1,92 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
-		<record model="ir.ui.view" id="view_invoice_line_form_inherit_1">
-			<field name="name">account.invoice.line.form.inherit_1</field>
-			<field name="model">account.invoice.line</field>
-			<field name="inherit_id" ref="account.view_invoice_line_form"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field[@name='name']" position="before">
-					<field name="state" select="1" on_change="onchange_invoice_line_view(state)" />
-					<field name="sequence"/>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_invoice_line_form_inherit_1">
+            <field name="name">account.invoice.line.form.inherit_1</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="account.view_invoice_line_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='name']" position="before">
+                    <field name="state" select="1" on_change="onchange_invoice_line_view(state)" />
+                    <field name="sequence"/>
+                </xpath>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_invoice_line_tree_inherit_1">
-			<field name="name">account.invoice.line.tree.inherit_1</field>
-			<field name="model">account.invoice.line</field>
-			<field name="inherit_id" ref="account.view_invoice_line_tree"/>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<xpath expr="/tree/field[@name='name']" position="before">
-					<field name="sequence" string="Seq."/>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_invoice_line_tree_inherit_1">
+            <field name="name">account.invoice.line.tree.inherit_1</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <xpath expr="/tree/field[@name='name']" position="before">
+                    <field name="sequence" string="Seq."/>
+                </xpath>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_invoice_line_tree_inherit_2">
-			<field name="name">account.invoice.line.tree.inherit_2</field>
-			<field name="model">account.invoice.line</field>
-			<field name="inherit_id" ref="view_invoice_line_tree_inherit_1"/>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<xpath expr="/tree/field[@name='account_id']" position="replace">
-					<field name="functional_field"/>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_invoice_line_tree_inherit_2">
+            <field name="name">account.invoice.line.tree.inherit_2</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="view_invoice_line_tree_inherit_1"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <xpath expr="/tree/field[@name='account_id']" position="replace">
+                    <field name="functional_field"/>
+                </xpath>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="account_invoice_form_inherit_1">
-			<field name="name">account.invoice.form.inherit_1</field>
-			<field name="model">account.invoice</field>
-			<field name="inherit_id" ref="account.invoice_form"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page/field[@name='invoice_line']" position="replace">
-					<!-- keep the original fields, because other views position on that, too -->
-					<field name="invoice_line" invisible="True"/>
-					<field name="abstract_line_ids" colspan="4" nolabel="1"/>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="account_invoice_form_inherit_1">
+            <field name="name">account.invoice.form.inherit_1</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='invoice_line']" position="replace">
+                    <!-- keep the original fields, because other views position on that, too -->
+                    <field name="invoice_line" invisible="True"/>
+                    <field name="abstract_line_ids" colspan="4" nolabel="1"/>
+                </xpath>
+            </field>
+        </record>
 
 <!-- notification message views -->
-	<record model="ir.ui.view" id="view_notify_message_tree">
-		<field name="name">notify.message.tree</field>
-		<field name="model">notify.message</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Messages">
-				<field name="name"/>
-				<field name="msg"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_notify_message_form">
-		<field name="name">notify.message.form</field>
-		<field name="model">notify.message</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Messages">
-				<separator string="Write a notification or a wishful message." colspan="4"/>
-				<field name="name" select="1" colspan="2" />
-				<field name="msg" select="1" colspan="2"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="notify_mesage_tree_form">
-		<field name="name">Write Messages</field>
-		<field name="res_model">notify.message</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	<menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
-	<menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
+    <record model="ir.ui.view" id="view_notify_message_tree">
+        <field name="name">notify.message.tree</field>
+        <field name="model">notify.message</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Messages">
+                <field name="name"/>
+                <field name="msg"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_notify_message_form">
+        <field name="name">notify.message.form</field>
+        <field name="model">notify.message</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Messages">
+                <separator string="Write a notification or a wishful message." colspan="4"/>
+                <field name="name" select="1" colspan="2" />
+                <field name="msg" select="1" colspan="2"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="notify_mesage_tree_form">
+        <field name="name">Write Messages</field>
+        <field name="res_model">notify.message</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
+    <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
 
 
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_invoice_layout/i18n/ar.po b/addons/account_invoice_layout/i18n/ar.po
index ccdde1c9ceb..058692b6bc4 100644
--- a/addons/account_invoice_layout/i18n/ar.po
+++ b/addons/account_invoice_layout/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/bg.po b/addons/account_invoice_layout/i18n/bg.po
index 7497a20fee5..2fdb561ec1c 100644
--- a/addons/account_invoice_layout/i18n/bg.po
+++ b/addons/account_invoice_layout/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/bs.po b/addons/account_invoice_layout/i18n/bs.po
index c1cdb737868..ad4fad56882 100644
--- a/addons/account_invoice_layout/i18n/bs.po
+++ b/addons/account_invoice_layout/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/ca.po b/addons/account_invoice_layout/i18n/ca.po
index 807eeaaa209..1bb21fce687 100644
--- a/addons/account_invoice_layout/i18n/ca.po
+++ b/addons/account_invoice_layout/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/cs.po b/addons/account_invoice_layout/i18n/cs.po
index ccdde1c9ceb..058692b6bc4 100644
--- a/addons/account_invoice_layout/i18n/cs.po
+++ b/addons/account_invoice_layout/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/de.po b/addons/account_invoice_layout/i18n/de.po
index 98125e12ad6..6e9638a47ba 100644
--- a/addons/account_invoice_layout/i18n/de.po
+++ b/addons/account_invoice_layout/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/el.po b/addons/account_invoice_layout/i18n/el.po
index 7022e8c875a..71b80936ffb 100644
--- a/addons/account_invoice_layout/i18n/el.po
+++ b/addons/account_invoice_layout/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/es.po b/addons/account_invoice_layout/i18n/es.po
index 246a38d942a..1a3ad90cc02 100644
--- a/addons/account_invoice_layout/i18n/es.po
+++ b/addons/account_invoice_layout/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/es_AR.po b/addons/account_invoice_layout/i18n/es_AR.po
index 3418addcfc9..dabd618a055 100644
--- a/addons/account_invoice_layout/i18n/es_AR.po
+++ b/addons/account_invoice_layout/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/et.po b/addons/account_invoice_layout/i18n/et.po
index d64d3c63e64..bbd005d9471 100644
--- a/addons/account_invoice_layout/i18n/et.po
+++ b/addons/account_invoice_layout/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/fi.po b/addons/account_invoice_layout/i18n/fi.po
index 935e7972aed..7fbf56afed6 100644
--- a/addons/account_invoice_layout/i18n/fi.po
+++ b/addons/account_invoice_layout/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/fr.po b/addons/account_invoice_layout/i18n/fr.po
index ee960295e3a..7c7a499d281 100644
--- a/addons/account_invoice_layout/i18n/fr.po
+++ b/addons/account_invoice_layout/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/hi.po b/addons/account_invoice_layout/i18n/hi.po
index eb05d32ea44..243962d0ca5 100644
--- a/addons/account_invoice_layout/i18n/hi.po
+++ b/addons/account_invoice_layout/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/hr.po b/addons/account_invoice_layout/i18n/hr.po
index 1ae26f281d7..33233bf7fdb 100644
--- a/addons/account_invoice_layout/i18n/hr.po
+++ b/addons/account_invoice_layout/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/hu.po b/addons/account_invoice_layout/i18n/hu.po
index ccdde1c9ceb..058692b6bc4 100644
--- a/addons/account_invoice_layout/i18n/hu.po
+++ b/addons/account_invoice_layout/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/id.po b/addons/account_invoice_layout/i18n/id.po
index f5816b5eccc..9f1682ad273 100644
--- a/addons/account_invoice_layout/i18n/id.po
+++ b/addons/account_invoice_layout/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/it.po b/addons/account_invoice_layout/i18n/it.po
index 97eb1825856..73245e149f3 100644
--- a/addons/account_invoice_layout/i18n/it.po
+++ b/addons/account_invoice_layout/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/iu.po b/addons/account_invoice_layout/i18n/iu.po
index 673cea4ec42..fa0127d2dc6 100644
--- a/addons/account_invoice_layout/i18n/iu.po
+++ b/addons/account_invoice_layout/i18n/iu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/ko.po b/addons/account_invoice_layout/i18n/ko.po
index a864f191559..5f8e5e17eba 100644
--- a/addons/account_invoice_layout/i18n/ko.po
+++ b/addons/account_invoice_layout/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+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 664b3166db1..4f0d58987c7 100644
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/nb.po b/addons/account_invoice_layout/i18n/nb.po
index 352be1a9953..1cff9bde37b 100644
--- a/addons/account_invoice_layout/i18n/nb.po
+++ b/addons/account_invoice_layout/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/nl.po b/addons/account_invoice_layout/i18n/nl.po
index aca745a15d9..36798c119ad 100644
--- a/addons/account_invoice_layout/i18n/nl.po
+++ b/addons/account_invoice_layout/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/nl_BE.po b/addons/account_invoice_layout/i18n/nl_BE.po
index ef639898a84..97097142597 100644
--- a/addons/account_invoice_layout/i18n/nl_BE.po
+++ b/addons/account_invoice_layout/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/oc.po b/addons/account_invoice_layout/i18n/oc.po
new file mode 100644
index 00000000000..48d6406d4eb
--- /dev/null
+++ b/addons/account_invoice_layout/i18n/oc.po
@@ -0,0 +1,313 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-04-17 09:32+0000\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Invoice Date:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr "Títol"
+
+#. module: account_invoice_layout
+#: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
+msgid "Invoices with Layout and Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "(Incl. taxes):"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr "Nòta"
+
+#. module: account_invoice_layout
+#: wizard_button:wizard.notify_message,init,print:0
+msgid "Print"
+msgstr "Estampar"
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Customer Ref:"
+msgstr "Referéncia Client :"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid ")"
+msgstr ")"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr "Tipe"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Price"
+msgstr "Prètz"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "/ ("
+msgstr "/ ("
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr "Compte d'origina"
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Base"
+msgstr "Basa"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Document:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: wizard_view:wizard.notify_message,init:0
+msgid "Select Message"
+msgstr "Seleccionatz lo Messatge"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr "Messatges"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr "Produch"
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices with Layout"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Description / Taxes"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Amount"
+msgstr "Soma"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Description/Taxes"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Quantity"
+msgstr "Quantitat"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Note :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Tax"
+msgstr "Impòstes e taxas"
+
+#. module: account_invoice_layout
+#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
+msgid "account_invoice_layout"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Total (Excl. taxes):"
+msgstr ""
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_invoice_layout
+#: wizard_button:wizard.notify_message,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: wizard_field:wizard.notify_message,init,message:0
+msgid "Message"
+msgstr "Messatge"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Total"
+msgstr "Total"
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr ""
diff --git a/addons/account_invoice_layout/i18n/pl.po b/addons/account_invoice_layout/i18n/pl.po
index c8f72b1a38a..c920a466bc9 100644
--- a/addons/account_invoice_layout/i18n/pl.po
+++ b/addons/account_invoice_layout/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/pt.po b/addons/account_invoice_layout/i18n/pt.po
index 561a5957e50..cbfbfc454a2 100644
--- a/addons/account_invoice_layout/i18n/pt.po
+++ b/addons/account_invoice_layout/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/pt_BR.po b/addons/account_invoice_layout/i18n/pt_BR.po
index 5afa11e7912..6cd3ce9aa44 100644
--- a/addons/account_invoice_layout/i18n/pt_BR.po
+++ b/addons/account_invoice_layout/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/ro.po b/addons/account_invoice_layout/i18n/ro.po
index caf1235a2e7..54cb82506db 100644
--- a/addons/account_invoice_layout/i18n/ro.po
+++ b/addons/account_invoice_layout/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/ru.po b/addons/account_invoice_layout/i18n/ru.po
index 653d3bddbad..7e121d1d6d4 100644
--- a/addons/account_invoice_layout/i18n/ru.po
+++ b/addons/account_invoice_layout/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/sl.po b/addons/account_invoice_layout/i18n/sl.po
index 03e656d8ff9..00963dd178e 100644
--- a/addons/account_invoice_layout/i18n/sl.po
+++ b/addons/account_invoice_layout/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/sv.po b/addons/account_invoice_layout/i18n/sv.po
index 1261f7e9283..869e8c4f9e4 100644
--- a/addons/account_invoice_layout/i18n/sv.po
+++ b/addons/account_invoice_layout/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/tlh.po b/addons/account_invoice_layout/i18n/tlh.po
index 4dc59d73c7c..8f337853097 100644
--- a/addons/account_invoice_layout/i18n/tlh.po
+++ b/addons/account_invoice_layout/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+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 fee4275a6ca..88791a017e0 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/uk.po b/addons/account_invoice_layout/i18n/uk.po
index 26263484eed..4e2a4265f65 100644
--- a/addons/account_invoice_layout/i18n/uk.po
+++ b/addons/account_invoice_layout/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/zh_CN.po b/addons/account_invoice_layout/i18n/zh_CN.po
index 7b617a9766a..fb07c4a833c 100644
--- a/addons/account_invoice_layout/i18n/zh_CN.po
+++ b/addons/account_invoice_layout/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/zh_TW.po b/addons/account_invoice_layout/i18n/zh_TW.po
index a2ada6f5678..46d49334642 100644
--- a/addons/account_invoice_layout/i18n/zh_TW.po
+++ b/addons/account_invoice_layout/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_payment/__terp__.py b/addons/account_payment/__openerp__.py
similarity index 100%
rename from addons/account_payment/__terp__.py
rename to addons/account_payment/__openerp__.py
diff --git a/addons/account_payment/i18n/ar.po b/addons/account_payment/i18n/ar.po
index efe3a9ada7d..eec828ea2ae 100644
--- a/addons/account_payment/i18n/ar.po
+++ b/addons/account_payment/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/bg.po b/addons/account_payment/i18n/bg.po
index 697a7a722e9..c20705b5d0f 100644
--- a/addons/account_payment/i18n/bg.po
+++ b/addons/account_payment/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/bs.po b/addons/account_payment/i18n/bs.po
index 20db662a651..19935f63103 100644
--- a/addons/account_payment/i18n/bs.po
+++ b/addons/account_payment/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/ca.po b/addons/account_payment/i18n/ca.po
index 101d803a9d2..d67113a6dd3 100644
--- a/addons/account_payment/i18n/ca.po
+++ b/addons/account_payment/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index 307e7372453..7139ac0c822 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index d34e780dbd2..191841f848c 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/el.po b/addons/account_payment/i18n/el.po
index 7fe88c0d229..f732b6ba6c9 100644
--- a/addons/account_payment/i18n/el.po
+++ b/addons/account_payment/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index 52a91b41943..164c66aa6a5 100644
--- a/addons/account_payment/i18n/es.po
+++ b/addons/account_payment/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/es_AR.po b/addons/account_payment/i18n/es_AR.po
index ebbf8691fec..811002c49d5 100644
--- a/addons/account_payment/i18n/es_AR.po
+++ b/addons/account_payment/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/et.po b/addons/account_payment/i18n/et.po
index a9df435cfbe..e985e4b1a94 100644
--- a/addons/account_payment/i18n/et.po
+++ b/addons/account_payment/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/fi.po b/addons/account_payment/i18n/fi.po
index defe43fe32c..2bc56d28db4 100644
--- a/addons/account_payment/i18n/fi.po
+++ b/addons/account_payment/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index 207ee97e40e..e93f340027a 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/hi.po b/addons/account_payment/i18n/hi.po
index 584e53c7c55..603f4769768 100644
--- a/addons/account_payment/i18n/hi.po
+++ b/addons/account_payment/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/hr.po b/addons/account_payment/i18n/hr.po
index 8b257064bbf..f33829fe304 100644
--- a/addons/account_payment/i18n/hr.po
+++ b/addons/account_payment/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/hu.po b/addons/account_payment/i18n/hu.po
index efe3a9ada7d..eec828ea2ae 100644
--- a/addons/account_payment/i18n/hu.po
+++ b/addons/account_payment/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index 6c646a2ef75..89787a7468c 100644
--- a/addons/account_payment/i18n/id.po
+++ b/addons/account_payment/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/it.po b/addons/account_payment/i18n/it.po
index 1e6d0bc779c..13e658a5358 100644
--- a/addons/account_payment/i18n/it.po
+++ b/addons/account_payment/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/ko.po b/addons/account_payment/i18n/ko.po
index 048c1bf9e4e..1d307bf3552 100644
--- a/addons/account_payment/i18n/ko.po
+++ b/addons/account_payment/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index 053536ba625..879123c9904 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 5c80a9be7bc..6d2ed12e6bc 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/nl_BE.po b/addons/account_payment/i18n/nl_BE.po
index aada7794678..674bed98861 100644
--- a/addons/account_payment/i18n/nl_BE.po
+++ b/addons/account_payment/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/pl.po b/addons/account_payment/i18n/pl.po
index c0b737c9330..0b4df4e8489 100644
--- a/addons/account_payment/i18n/pl.po
+++ b/addons/account_payment/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/pt.po b/addons/account_payment/i18n/pt.po
index 7d44dcd1d53..b28f88bb758 100644
--- a/addons/account_payment/i18n/pt.po
+++ b/addons/account_payment/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po
index db208e38a34..c04d13f47bf 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index 75a55b5cb67..21c3740f6c7 100644
--- a/addons/account_payment/i18n/ro.po
+++ b/addons/account_payment/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index 80e27b216b5..29375a94ca7 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/sl.po b/addons/account_payment/i18n/sl.po
index f4307cd4d07..3f634880e39 100644
--- a/addons/account_payment/i18n/sl.po
+++ b/addons/account_payment/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index 5e841bd05cb..f2242802e1b 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/tlh.po b/addons/account_payment/i18n/tlh.po
index 96f6210e559..b34158d90da 100644
--- a/addons/account_payment/i18n/tlh.po
+++ b/addons/account_payment/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+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 721ee01bc5d..778b19392b9 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/uk.po b/addons/account_payment/i18n/uk.po
index 75f5f5792d2..1d510b3d580 100644
--- a/addons/account_payment/i18n/uk.po
+++ b/addons/account_payment/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 87ce9c455be..2dbc570776c 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index 6e264fbebe0..d286f946397 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index cf481f5aa39..a0ab77a5934 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -10,7 +10,7 @@
             <field name="inherit_id" ref="account.view_move_line_form"/>
             <field name="arch" type="xml">
                 <field name="reconcile_partial_id" position="after">
-                    <field name="amount_to_pay" select="2"/>
+                    <field name="amount_to_pay"/>
                 </field>
             </field>
         </record>
@@ -90,7 +90,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-		<menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/>
+        <menuitem id="next_id_44" name="Payment" parent="account.menu_finance_configuration"/>
 
         <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="next_id_44"/>
 
@@ -106,7 +106,7 @@
                     <field name="mode"/>
                     <field name="date_prefered"/>
                     <field name="date_planned" select="1"/>
-                    <field name="user_id" select="2"/>
+                    <field name="user_id"/>
                     <button colspan="2" name="%(wizard_populate_payment)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                     <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1">
                         <form string="Payment Line">
@@ -116,7 +116,7 @@
                                     <separator colspan="4" string="Transaction Information"/>
                                     <field name="date"/>
                                     <group colspan="2">
-                                        <field name="amount_currency" select="2" on_change="onchange_amount(amount_currency,currency,company_currency)"/>
+                                        <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)"/>
                                         <field name="currency" nolabel="1"/>
                                     </group>
                                     <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)" select="1"/>
@@ -150,14 +150,14 @@
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
                             <field name="date"/>
-                            <field name="amount_currency" select="2" string="Amount"/>
+                            <field name="amount_currency" string="Amount"/>
                             <field name="currency"/>
                             <field name="name"/>
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>
                         </tree>
                     </field>
-                    <field name="date_created" select="2"/>
-                    <field name="date_done" select="2"/>
+                    <field name="date_created"/>
+                    <field name="date_done"/>
                     <field name="state" readonly="1" select="1"/>
                     <group col="4" colspan="2">
                          <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
@@ -179,8 +179,8 @@
                     <field name="reference"/>
                     <field name="mode"/>
                     <field name="date_planned"/>
-                    <field name="date_created" select="2"/>
-                    <field name="date_done" select="2"/>
+                    <field name="date_created"/>
+                    <field name="date_done"/>
                     <field name="total"/>
                     <field name="state"/>
                 </tree>
@@ -232,7 +232,7 @@
                             <separator colspan="4" string="Transaction Information"/>
                             <field name="date"/>
                             <group colspan="2">
-                                <field name="amount_currency" select="2" on_change="onchange_amount(amount_currency,currency,comapny_currency)"/>
+                                <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,comapny_currency)"/>
                                 <field name="currency" nolabel="1"/>
                             </group>
                             <field name="partner_id" on_change="onchange_partner(partner_id, False)" select="1"/>
@@ -275,7 +275,7 @@
                     <field name="ml_maturity_date"/>
                     <field name="partner_id" select="1"/>
                     <field name="amount" sum="Amount Total"/>
-                    <field name="amount_currency" sum="Currency Amount Total" select="2" />
+                    <field name="amount_currency" sum="Currency Amount Total"/>
                     <field name="currency"/>
                     <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                     <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>
diff --git a/addons/account_report/__terp__.py b/addons/account_report/__openerp__.py
similarity index 100%
rename from addons/account_report/__terp__.py
rename to addons/account_report/__openerp__.py
diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index 1ed898dd02d..82fb48e5e8b 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -166,7 +166,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Report History">
-                    <field name="period_id" select="2"/>
+                    <field name="period_id"/>
                     <field name="fiscalyear_id" select="1"/>
                     <field name="name" select="1"/>
                     <field name="val"/>
diff --git a/addons/account_report/i18n/ar.po b/addons/account_report/i18n/ar.po
index 5c4649fb657..083383ceb01 100644
--- a/addons/account_report/i18n/ar.po
+++ b/addons/account_report/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/bg.po b/addons/account_report/i18n/bg.po
index 38c677a953c..8d6a0533c69 100644
--- a/addons/account_report/i18n/bg.po
+++ b/addons/account_report/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/bs.po b/addons/account_report/i18n/bs.po
index 4760a0dba4b..f4f9a6ac3ec 100644
--- a/addons/account_report/i18n/bs.po
+++ b/addons/account_report/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/ca.po b/addons/account_report/i18n/ca.po
index 8285cdc30a7..37c93008397 100644
--- a/addons/account_report/i18n/ca.po
+++ b/addons/account_report/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/cs.po b/addons/account_report/i18n/cs.po
index 5c4649fb657..083383ceb01 100644
--- a/addons/account_report/i18n/cs.po
+++ b/addons/account_report/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/de.po b/addons/account_report/i18n/de.po
index 679a3f2be38..85e738ba46d 100644
--- a/addons/account_report/i18n/de.po
+++ b/addons/account_report/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/el.po b/addons/account_report/i18n/el.po
index 5c359002f0a..56c346bc06d 100644
--- a/addons/account_report/i18n/el.po
+++ b/addons/account_report/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/es.po b/addons/account_report/i18n/es.po
index 53a939a4015..330292a2ecf 100644
--- a/addons/account_report/i18n/es.po
+++ b/addons/account_report/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/es_AR.po b/addons/account_report/i18n/es_AR.po
index f8905255489..50ee1ce5081 100644
--- a/addons/account_report/i18n/es_AR.po
+++ b/addons/account_report/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/et.po b/addons/account_report/i18n/et.po
index adc92423f3c..fb919842a67 100644
--- a/addons/account_report/i18n/et.po
+++ b/addons/account_report/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/fi.po b/addons/account_report/i18n/fi.po
index 90fa5380255..c80f0a7d8be 100644
--- a/addons/account_report/i18n/fi.po
+++ b/addons/account_report/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/fr.po b/addons/account_report/i18n/fr.po
index ad953823b84..13b63e58012 100644
--- a/addons/account_report/i18n/fr.po
+++ b/addons/account_report/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/hr.po b/addons/account_report/i18n/hr.po
index c059ad88dc9..e7944f3c3bd 100644
--- a/addons/account_report/i18n/hr.po
+++ b/addons/account_report/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/hu.po b/addons/account_report/i18n/hu.po
index 5c4649fb657..083383ceb01 100644
--- a/addons/account_report/i18n/hu.po
+++ b/addons/account_report/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/id.po b/addons/account_report/i18n/id.po
index a4c87a1cfe7..835b7f714a6 100644
--- a/addons/account_report/i18n/id.po
+++ b/addons/account_report/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po
index c36fa43c84f..f0f0e3378c8 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/ko.po b/addons/account_report/i18n/ko.po
index e450b4d09d5..e57d5bd0778 100644
--- a/addons/account_report/i18n/ko.po
+++ b/addons/account_report/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+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 b35b82c000e..21086432e32 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/nl.po b/addons/account_report/i18n/nl.po
index 22cafca33bc..1469c0a8c2b 100644
--- a/addons/account_report/i18n/nl.po
+++ b/addons/account_report/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/nl_BE.po b/addons/account_report/i18n/nl_BE.po
index 9f28190aeb7..99351dfdbd8 100644
--- a/addons/account_report/i18n/nl_BE.po
+++ b/addons/account_report/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/pl.po b/addons/account_report/i18n/pl.po
index 4621b045637..ec822afc4c3 100644
--- a/addons/account_report/i18n/pl.po
+++ b/addons/account_report/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/pt.po b/addons/account_report/i18n/pt.po
index ac408449167..d127a761872 100644
--- a/addons/account_report/i18n/pt.po
+++ b/addons/account_report/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/pt_BR.po b/addons/account_report/i18n/pt_BR.po
index 0375d02f81a..5fccaae5594 100644
--- a/addons/account_report/i18n/pt_BR.po
+++ b/addons/account_report/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/ro.po b/addons/account_report/i18n/ro.po
index 13f7430490a..2ef19a71928 100644
--- a/addons/account_report/i18n/ro.po
+++ b/addons/account_report/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/ru.po b/addons/account_report/i18n/ru.po
index ba7a50d6a7a..4a3165a099f 100644
--- a/addons/account_report/i18n/ru.po
+++ b/addons/account_report/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/sl.po b/addons/account_report/i18n/sl.po
index fba07ca5a2b..ed865ce0b28 100644
--- a/addons/account_report/i18n/sl.po
+++ b/addons/account_report/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/sv.po b/addons/account_report/i18n/sv.po
index d93855dda94..c42f6b27568 100644
--- a/addons/account_report/i18n/sv.po
+++ b/addons/account_report/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/tlh.po b/addons/account_report/i18n/tlh.po
index 458470d9134..e7d2accaeb2 100644
--- a/addons/account_report/i18n/tlh.po
+++ b/addons/account_report/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+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 81bcc502101..3a103ee7e28 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/uk.po b/addons/account_report/i18n/uk.po
index dfe0bdf4885..2a51048b06f 100644
--- a/addons/account_report/i18n/uk.po
+++ b/addons/account_report/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/zh_CN.po b/addons/account_report/i18n/zh_CN.po
index 62d815b50f4..bfdb16a52fe 100644
--- a/addons/account_report/i18n/zh_CN.po
+++ b/addons/account_report/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/zh_TW.po b/addons/account_report/i18n/zh_TW.po
index 2d3d7c77775..57b0bbb9d94 100644
--- a/addons/account_report/i18n/zh_TW.po
+++ b/addons/account_report/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_reporting/__terp__.py b/addons/account_reporting/__openerp__.py
similarity index 100%
rename from addons/account_reporting/__terp__.py
rename to addons/account_reporting/__openerp__.py
diff --git a/addons/account_reporting/i18n/ar.po b/addons/account_reporting/i18n/ar.po
index 73c4bab43b5..bc8a62130e0 100644
--- a/addons/account_reporting/i18n/ar.po
+++ b/addons/account_reporting/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/bg.po b/addons/account_reporting/i18n/bg.po
index f7bed309949..3dce38a45d7 100644
--- a/addons/account_reporting/i18n/bg.po
+++ b/addons/account_reporting/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/bs.po b/addons/account_reporting/i18n/bs.po
index 551da5e9354..daaf992ddd8 100644
--- a/addons/account_reporting/i18n/bs.po
+++ b/addons/account_reporting/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/ca.po b/addons/account_reporting/i18n/ca.po
index e14231c74f4..888e9471af5 100644
--- a/addons/account_reporting/i18n/ca.po
+++ b/addons/account_reporting/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/cs.po b/addons/account_reporting/i18n/cs.po
index 73c4bab43b5..bc8a62130e0 100644
--- a/addons/account_reporting/i18n/cs.po
+++ b/addons/account_reporting/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/de.po b/addons/account_reporting/i18n/de.po
index 643137328d5..070224710ad 100644
--- a/addons/account_reporting/i18n/de.po
+++ b/addons/account_reporting/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/el.po b/addons/account_reporting/i18n/el.po
index 20d6ab42450..163ac9e3ca1 100644
--- a/addons/account_reporting/i18n/el.po
+++ b/addons/account_reporting/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/es.po b/addons/account_reporting/i18n/es.po
index a4ecc7a9a60..ae864e497d3 100644
--- a/addons/account_reporting/i18n/es.po
+++ b/addons/account_reporting/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/es_AR.po b/addons/account_reporting/i18n/es_AR.po
index 3b01c80235b..6bdd1b3b531 100644
--- a/addons/account_reporting/i18n/es_AR.po
+++ b/addons/account_reporting/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/et.po b/addons/account_reporting/i18n/et.po
index 82065b0422e..90c5899a4b7 100644
--- a/addons/account_reporting/i18n/et.po
+++ b/addons/account_reporting/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/fi.po b/addons/account_reporting/i18n/fi.po
index f122c805d70..84728a5312c 100644
--- a/addons/account_reporting/i18n/fi.po
+++ b/addons/account_reporting/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/fr.po b/addons/account_reporting/i18n/fr.po
index 0326eb29dd8..0edb42ee220 100644
--- a/addons/account_reporting/i18n/fr.po
+++ b/addons/account_reporting/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/hr.po b/addons/account_reporting/i18n/hr.po
index 459c595ea34..04a8df7ab7b 100644
--- a/addons/account_reporting/i18n/hr.po
+++ b/addons/account_reporting/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/hu.po b/addons/account_reporting/i18n/hu.po
index 73c4bab43b5..bc8a62130e0 100644
--- a/addons/account_reporting/i18n/hu.po
+++ b/addons/account_reporting/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/id.po b/addons/account_reporting/i18n/id.po
index 1d18fc4c7d8..fe0f5cefff5 100644
--- a/addons/account_reporting/i18n/id.po
+++ b/addons/account_reporting/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/it.po b/addons/account_reporting/i18n/it.po
index ef84d66febb..7a949076556 100644
--- a/addons/account_reporting/i18n/it.po
+++ b/addons/account_reporting/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/ko.po b/addons/account_reporting/i18n/ko.po
index 87318cb79a4..fe5591e289c 100644
--- a/addons/account_reporting/i18n/ko.po
+++ b/addons/account_reporting/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index fae99aee833..5b652c5a395 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/nl.po b/addons/account_reporting/i18n/nl.po
index 5ce0018dce7..33267c1d6be 100644
--- a/addons/account_reporting/i18n/nl.po
+++ b/addons/account_reporting/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/nl_BE.po b/addons/account_reporting/i18n/nl_BE.po
index 7b13398dfae..b32e25e3bee 100644
--- a/addons/account_reporting/i18n/nl_BE.po
+++ b/addons/account_reporting/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/pl.po b/addons/account_reporting/i18n/pl.po
index 0dac6c39d74..023edeaf02c 100644
--- a/addons/account_reporting/i18n/pl.po
+++ b/addons/account_reporting/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/pt.po b/addons/account_reporting/i18n/pt.po
index 8b79bf1aec8..03f50826416 100644
--- a/addons/account_reporting/i18n/pt.po
+++ b/addons/account_reporting/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/pt_BR.po b/addons/account_reporting/i18n/pt_BR.po
index b75916ba7f9..e529e5c5787 100644
--- a/addons/account_reporting/i18n/pt_BR.po
+++ b/addons/account_reporting/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/ro.po b/addons/account_reporting/i18n/ro.po
index a9e584d0295..3b357ace5fb 100644
--- a/addons/account_reporting/i18n/ro.po
+++ b/addons/account_reporting/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/ru.po b/addons/account_reporting/i18n/ru.po
index 93c730bc999..13ecbdbed45 100644
--- a/addons/account_reporting/i18n/ru.po
+++ b/addons/account_reporting/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/sl.po b/addons/account_reporting/i18n/sl.po
index 90af3526866..f6743ff005c 100644
--- a/addons/account_reporting/i18n/sl.po
+++ b/addons/account_reporting/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/sv.po b/addons/account_reporting/i18n/sv.po
index c24790f4159..b823ae5ee27 100644
--- a/addons/account_reporting/i18n/sv.po
+++ b/addons/account_reporting/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/tlh.po b/addons/account_reporting/i18n/tlh.po
index 8eba08fb772..2c13da1d75a 100644
--- a/addons/account_reporting/i18n/tlh.po
+++ b/addons/account_reporting/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+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 6e0e2517b86..6f19c31bb10 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/uk.po b/addons/account_reporting/i18n/uk.po
index 879cd3a024a..4b2d33a88c3 100644
--- a/addons/account_reporting/i18n/uk.po
+++ b/addons/account_reporting/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/zh_CN.po b/addons/account_reporting/i18n/zh_CN.po
index a9e0f82ebbd..88a9be3723d 100644
--- a/addons/account_reporting/i18n/zh_CN.po
+++ b/addons/account_reporting/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/zh_TW.po b/addons/account_reporting/i18n/zh_TW.po
index e0ed5cf58b2..d9a400f2162 100644
--- a/addons/account_reporting/i18n/zh_TW.po
+++ b/addons/account_reporting/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_tax_include/__terp__.py b/addons/account_tax_include/__openerp__.py
similarity index 100%
rename from addons/account_tax_include/__terp__.py
rename to addons/account_tax_include/__openerp__.py
diff --git a/addons/account_tax_include/i18n/ar.po b/addons/account_tax_include/i18n/ar.po
index 838dd5c061f..2ea3d31ed0a 100644
--- a/addons/account_tax_include/i18n/ar.po
+++ b/addons/account_tax_include/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/bg.po b/addons/account_tax_include/i18n/bg.po
index 962fcb8b815..fff9c26bf05 100644
--- a/addons/account_tax_include/i18n/bg.po
+++ b/addons/account_tax_include/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/bs.po b/addons/account_tax_include/i18n/bs.po
index ef136031348..ab16e300b28 100644
--- a/addons/account_tax_include/i18n/bs.po
+++ b/addons/account_tax_include/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/ca.po b/addons/account_tax_include/i18n/ca.po
index 5861b7951f9..249686fa488 100644
--- a/addons/account_tax_include/i18n/ca.po
+++ b/addons/account_tax_include/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/cs.po b/addons/account_tax_include/i18n/cs.po
index 838dd5c061f..1b6c23eccc0 100644
--- a/addons/account_tax_include/i18n/cs.po
+++ b/addons/account_tax_include/i18n/cs.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-04-17 18:14+0000\n"
+"Last-Translator: Valerie Engel <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-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neplatný XML pro zobrazení architektury"
 
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
diff --git a/addons/account_tax_include/i18n/de.po b/addons/account_tax_include/i18n/de.po
index ce8514c3b82..fa5d2ce1610 100644
--- a/addons/account_tax_include/i18n/de.po
+++ b/addons/account_tax_include/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-10 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/el.po b/addons/account_tax_include/i18n/el.po
index c733947a025..6d3910fb43b 100644
--- a/addons/account_tax_include/i18n/el.po
+++ b/addons/account_tax_include/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/en_AU.po b/addons/account_tax_include/i18n/en_AU.po
index d7c13bc320c..ae6cc0da559 100644
--- a/addons/account_tax_include/i18n/en_AU.po
+++ b/addons/account_tax_include/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/es.po b/addons/account_tax_include/i18n/es.po
index 4952c135e8c..4fa9a9219c7 100644
--- a/addons/account_tax_include/i18n/es.po
+++ b/addons/account_tax_include/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/es_AR.po b/addons/account_tax_include/i18n/es_AR.po
index 1c16a29d059..4d7230f383b 100644
--- a/addons/account_tax_include/i18n/es_AR.po
+++ b/addons/account_tax_include/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/et.po b/addons/account_tax_include/i18n/et.po
index e8c62184d90..6bd6d5cdaa7 100644
--- a/addons/account_tax_include/i18n/et.po
+++ b/addons/account_tax_include/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/fi.po b/addons/account_tax_include/i18n/fi.po
index 45b0f27e316..6e3c999484d 100644
--- a/addons/account_tax_include/i18n/fi.po
+++ b/addons/account_tax_include/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/fr.po b/addons/account_tax_include/i18n/fr.po
index 5e7fe31fd4a..c26f075fd75 100644
--- a/addons/account_tax_include/i18n/fr.po
+++ b/addons/account_tax_include/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/gl.po b/addons/account_tax_include/i18n/gl.po
index e0b844d0551..e677bb72d35 100644
--- a/addons/account_tax_include/i18n/gl.po
+++ b/addons/account_tax_include/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/hr.po b/addons/account_tax_include/i18n/hr.po
index aba51f0c29f..ac67721e45b 100644
--- a/addons/account_tax_include/i18n/hr.po
+++ b/addons/account_tax_include/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/hu.po b/addons/account_tax_include/i18n/hu.po
index 838dd5c061f..2ea3d31ed0a 100644
--- a/addons/account_tax_include/i18n/hu.po
+++ b/addons/account_tax_include/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/id.po b/addons/account_tax_include/i18n/id.po
index a3cb6005de3..bcb9daf3353 100644
--- a/addons/account_tax_include/i18n/id.po
+++ b/addons/account_tax_include/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/it.po b/addons/account_tax_include/i18n/it.po
index 4ecfc99c8f7..0e304d60033 100644
--- a/addons/account_tax_include/i18n/it.po
+++ b/addons/account_tax_include/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/ko.po b/addons/account_tax_include/i18n/ko.po
index 4e673d5c8b4..118579be264 100644
--- a/addons/account_tax_include/i18n/ko.po
+++ b/addons/account_tax_include/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/lt.po b/addons/account_tax_include/i18n/lt.po
index b6a2665df65..110d0fdd041 100644
--- a/addons/account_tax_include/i18n/lt.po
+++ b/addons/account_tax_include/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/nl.po b/addons/account_tax_include/i18n/nl.po
index b6ab5f0672b..a5c550807f5 100644
--- a/addons/account_tax_include/i18n/nl.po
+++ b/addons/account_tax_include/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/nl_BE.po b/addons/account_tax_include/i18n/nl_BE.po
index 4f9a2bfeab0..1854bbfc9d4 100644
--- a/addons/account_tax_include/i18n/nl_BE.po
+++ b/addons/account_tax_include/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/pl.po b/addons/account_tax_include/i18n/pl.po
index f5a456277ce..aa4daff1f43 100644
--- a/addons/account_tax_include/i18n/pl.po
+++ b/addons/account_tax_include/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/pt.po b/addons/account_tax_include/i18n/pt.po
index ac79c33dc94..23c89d66568 100644
--- a/addons/account_tax_include/i18n/pt.po
+++ b/addons/account_tax_include/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/pt_BR.po b/addons/account_tax_include/i18n/pt_BR.po
index b0a6ae92a87..165ddba21ef 100644
--- a/addons/account_tax_include/i18n/pt_BR.po
+++ b/addons/account_tax_include/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/ro.po b/addons/account_tax_include/i18n/ro.po
index d265f1a9cf5..53f0beb8e17 100644
--- a/addons/account_tax_include/i18n/ro.po
+++ b/addons/account_tax_include/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/ru.po b/addons/account_tax_include/i18n/ru.po
index c1d714cf07f..e61c38be4a1 100644
--- a/addons/account_tax_include/i18n/ru.po
+++ b/addons/account_tax_include/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
@@ -29,7 +29,7 @@ msgstr "Метод расчета цены"
 #. module: account_tax_include
 #: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
 msgid "Invoices and prices with taxes included"
-msgstr ""
+msgstr "Счета и цены с налогами"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
@@ -49,4 +49,4 @@ msgstr ""
 #. module: account_tax_include
 #: field:account.invoice.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Промежуточный итог"
diff --git a/addons/account_tax_include/i18n/sk.po b/addons/account_tax_include/i18n/sk.po
index c76f1ae7c96..8518e5bcb1f 100644
--- a/addons/account_tax_include/i18n/sk.po
+++ b/addons/account_tax_include/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/sl.po b/addons/account_tax_include/i18n/sl.po
index 7e0047f0db5..defa396c48f 100644
--- a/addons/account_tax_include/i18n/sl.po
+++ b/addons/account_tax_include/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/sv.po b/addons/account_tax_include/i18n/sv.po
index c81c1b87ceb..8991458538f 100644
--- a/addons/account_tax_include/i18n/sv.po
+++ b/addons/account_tax_include/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/tlh.po b/addons/account_tax_include/i18n/tlh.po
index 95c73167222..901fb52fa52 100644
--- a/addons/account_tax_include/i18n/tlh.po
+++ b/addons/account_tax_include/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index 5f504db8c51..fae1694aa91 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/uk.po b/addons/account_tax_include/i18n/uk.po
index 909564f3314..20833c98611 100644
--- a/addons/account_tax_include/i18n/uk.po
+++ b/addons/account_tax_include/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/zh_CN.po b/addons/account_tax_include/i18n/zh_CN.po
index 70d2ca164cb..b7cad52c049 100644
--- a/addons/account_tax_include/i18n/zh_CN.po
+++ b/addons/account_tax_include/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/zh_TW.po b/addons/account_tax_include/i18n/zh_TW.po
index 8176287845c..a2ba31339c4 100644
--- a/addons/account_tax_include/i18n/zh_TW.po
+++ b/addons/account_tax_include/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__openerp__.py
similarity index 100%
rename from addons/account_voucher/__terp__.py
rename to addons/account_voucher/__openerp__.py
diff --git a/addons/account_voucher/account_view.xml b/addons/account_voucher/account_view.xml
index 62333c56873..11f3e82dfa0 100755
--- a/addons/account_voucher/account_view.xml
+++ b/addons/account_voucher/account_view.xml
@@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
+    <data>
 
-		<record model="ir.ui.view" id="account_form1">
-			<field name="name">account.form1</field>
-			<field name="inherit_id" ref="account.view_account_form"/>
-			<field name="model">account.account</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="user_type" position="after">
-					<field name="balance" string="Closing Balance" select="2"/>
-					<field name="type1" select="2" />
-					<field name="open_bal" select="2"/>
-					<field name="journal_id"/>
-				</field>
-			</field>
-		</record>
-		
-		<record model="ir.ui.view" id="account_form2">
-			<field name="name">account.form2</field>
-			<field name="inherit_id" ref="account.view_account_form"/>
-			<field name="model">account.account</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="user_type" position="replace">
-						<field name="user_type" select="1" on_change="onchange_type(user_type,type1)"/>
-				</field>
-			</field>
-		</record>
-		
-		<record model="ir.ui.view" id="account_tree1">
-			<field name="name">account.tree1</field>
-			<field name="inherit_id" ref="account.view_account_tree"/>
-			<field name="model">account.account</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<field name="name" position="after">
-						<field name="open_bal" select="1"/>
-				</field>
-			</field>
-		</record>
-		
-		<record model="ir.ui.view" id="account_tree2">
-			<field name="name">account.tree2</field>
-			<field name="inherit_id" ref="account.view_account_tree"/>
-			<field name="model">account.account</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<field name="company_currency_id" position="before">
-					<field name="type1"/>
-				</field>
-			</field>
-		</record>
-	
-        <!--	sub_currency	-->
-		<record model="ir.ui.view" id="sub_currency_form">
-			<field name="name">sub.currency.form</field>
-			<field name="inherit_id" ref="base.view_currency_form" />
-			<field name="model">res.currency</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="name" position="after">
-					<field name="sub_name" />
-				</field>
-			</field>
-		</record>
-		
-		<act_window name="Opening Balance Entry"
-			domain="[('journal_id', '=', journal_id)]"
-			res_model="account.move.line"
-			src_model="account.account"
-			id="act_account_acount_move_line_open1"/>
+        <record model="ir.ui.view" id="account_form1">
+            <field name="name">account.form1</field>
+            <field name="inherit_id" ref="account.view_account_form"/>
+            <field name="model">account.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="user_type" position="after">
+                    <field name="balance" string="Closing Balance"/>
+                    <field name="type1" />
+                    <field name="open_bal"/>
+                    <field name="journal_id"/>
+                </field>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="account_form2">
+            <field name="name">account.form2</field>
+            <field name="inherit_id" ref="account.view_account_form"/>
+            <field name="model">account.account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="user_type" position="replace">
+                        <field name="user_type" select="1" on_change="onchange_type(user_type,type1)"/>
+                </field>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="account_tree1">
+            <field name="name">account.tree1</field>
+            <field name="inherit_id" ref="account.view_account_tree"/>
+            <field name="model">account.account</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="name" position="after">
+                        <field name="open_bal" select="1"/>
+                </field>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="account_tree2">
+            <field name="name">account.tree2</field>
+            <field name="inherit_id" ref="account.view_account_tree"/>
+            <field name="model">account.account</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="company_currency_id" position="before">
+                    <field name="type1"/>
+                </field>
+            </field>
+        </record>
+    
+        <!--    sub_currency    -->
+        <record model="ir.ui.view" id="sub_currency_form">
+            <field name="name">sub.currency.form</field>
+            <field name="inherit_id" ref="base.view_currency_form" />
+            <field name="model">res.currency</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="name" position="after">
+                    <field name="sub_name" />
+                </field>
+            </field>
+        </record>
+        
+        <act_window name="Opening Balance Entry"
+            domain="[('journal_id', '=', journal_id)]"
+            res_model="account.move.line"
+            src_model="account.account"
+            id="act_account_acount_move_line_open1"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_voucher/i18n/ar.po b/addons/account_voucher/i18n/ar.po
index a074fdb72f5..98cd27e72c2 100644
--- a/addons/account_voucher/i18n/ar.po
+++ b/addons/account_voucher/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/bg.po b/addons/account_voucher/i18n/bg.po
index ab279037b21..94d5209bfa2 100644
--- a/addons/account_voucher/i18n/bg.po
+++ b/addons/account_voucher/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index 6b5f1fe788e..7fa4b9537c2 100644
--- a/addons/account_voucher/i18n/bs.po
+++ b/addons/account_voucher/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ca.po b/addons/account_voucher/i18n/ca.po
index b78f556c5f0..5d7e3b81fbe 100644
--- a/addons/account_voucher/i18n/ca.po
+++ b/addons/account_voucher/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po
index a074fdb72f5..98cd27e72c2 100644
--- a/addons/account_voucher/i18n/cs.po
+++ b/addons/account_voucher/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index f65d09b57e8..f34532f5bf4 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index f235ce42b99..a31ae3d6a56 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 45e5c70f23d..9422dfd9fde 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index 8c5bd620fe4..4f9c148cf3c 100644
--- a/addons/account_voucher/i18n/es_AR.po
+++ b/addons/account_voucher/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index e55ea6756f9..888a5b6f828 100644
--- a/addons/account_voucher/i18n/et.po
+++ b/addons/account_voucher/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index 48462599e66..eb629c99de8 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index a2409c4575b..56a06dff3d9 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index a074fdb72f5..98cd27e72c2 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index 76fab6712ac..ba6847eac91 100644
--- a/addons/account_voucher/i18n/id.po
+++ b/addons/account_voucher/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index 8c0250703a9..4931c40674a 100644
--- a/addons/account_voucher/i18n/it.po
+++ b/addons/account_voucher/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index e1da261edbe..f798e70f364 100644
--- a/addons/account_voucher/i18n/ko.po
+++ b/addons/account_voucher/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 5ebd3f0ce84..8bf8e0ae053 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index 6e74cd58ec1..a7dfa7d691e 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index 57255fcdbfd..4ea187a239b 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 8d0d5ce86ec..b2f4d987fcd 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index 30524f1294e..e26a4e886b0 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index a138b815ca9..9e67780b37f 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index 42e5ea83fa8..07b7e7e62d5 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index d9ad1b57de0..c88154a2b93 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index 43b40eab80e..4059f2ff1bd 100644
--- a/addons/account_voucher/i18n/sl.po
+++ b/addons/account_voucher/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index eed04b2f024..1b1253e82a5 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index 6c917765925..40fc58cf78e 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index 247e4aa6fce..3245ee5af6c 100644
--- a/addons/account_voucher/i18n/tlh.po
+++ b/addons/account_voucher/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+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 cb29e0b7649..9d668394c31 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index f1b37a424ab..056277ba166 100644
--- a/addons/account_voucher/i18n/uk.po
+++ b/addons/account_voucher/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index 8de15211a03..2f2ea753a7c 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 6d82c9ec000..059c47f3f9c 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index d0f95206ee8..a4a789a6e5e 100755
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -26,11 +26,11 @@
                     <group col="6" colspan="4">
                         <field name="name" select="1" colspan="4"/>
                         <field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
-                        <field name="account_id" select="2" on_change="onchange_account(account_id)"/>
-                        <field name="type" select="2" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" on_change="onchange_account(account_id)"/>
+                        <field name="type" on_change="onchange_journal(journal_id,type)"/>
                         <field name="number"/>
                         <!--field name="amount" select="1" invisible="1"/-->
-                        <!--field name="partner_id" select="2"/-->
+                        <!--field name="partner_id"/-->
                     </group>
                     <notebook colspan="4">
                         <page string="Entry Lines">
@@ -60,7 +60,7 @@
                             <field name="currency_id" select="1" />
                             <field name="period_id"/>
                             <field name="date" select="1"/>
-                            <!--field name="reference_type" select="2" nolabel="1" size="0"/>
+                            <!--field name="reference_type" nolabel="1" size="0"/>
                             <field name="reference" select="1" nolabel="1"/-->
                             <separator string="General Entries" colspan="4"/>
                             <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
diff --git a/addons/analytic/__terp__.py b/addons/analytic/__openerp__.py
similarity index 100%
rename from addons/analytic/__terp__.py
rename to addons/analytic/__openerp__.py
diff --git a/addons/analytic_journal_billing_rate/__terp__.py b/addons/analytic_journal_billing_rate/__openerp__.py
similarity index 100%
rename from addons/analytic_journal_billing_rate/__terp__.py
rename to addons/analytic_journal_billing_rate/__openerp__.py
diff --git a/addons/analytic_journal_billing_rate/i18n/ar.po b/addons/analytic_journal_billing_rate/i18n/ar.po
index 30ad37bff7a..41af5a0e7dc 100644
--- a/addons/analytic_journal_billing_rate/i18n/ar.po
+++ b/addons/analytic_journal_billing_rate/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/bg.po b/addons/analytic_journal_billing_rate/i18n/bg.po
index aa3fc999354..6f5177798fb 100644
--- a/addons/analytic_journal_billing_rate/i18n/bg.po
+++ b/addons/analytic_journal_billing_rate/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/bs.po b/addons/analytic_journal_billing_rate/i18n/bs.po
index 735f5cf57e7..6793cd8b2d2 100644
--- a/addons/analytic_journal_billing_rate/i18n/bs.po
+++ b/addons/analytic_journal_billing_rate/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ca.po b/addons/analytic_journal_billing_rate/i18n/ca.po
index aa57fdd5b48..d48197445a3 100644
--- a/addons/analytic_journal_billing_rate/i18n/ca.po
+++ b/addons/analytic_journal_billing_rate/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/cs.po b/addons/analytic_journal_billing_rate/i18n/cs.po
index 30ad37bff7a..41af5a0e7dc 100644
--- a/addons/analytic_journal_billing_rate/i18n/cs.po
+++ b/addons/analytic_journal_billing_rate/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/de.po b/addons/analytic_journal_billing_rate/i18n/de.po
index 6bd9903387d..c0f6f695038 100644
--- a/addons/analytic_journal_billing_rate/i18n/de.po
+++ b/addons/analytic_journal_billing_rate/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/el.po b/addons/analytic_journal_billing_rate/i18n/el.po
index d3319f67748..dd4c30271ff 100644
--- a/addons/analytic_journal_billing_rate/i18n/el.po
+++ b/addons/analytic_journal_billing_rate/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/es.po b/addons/analytic_journal_billing_rate/i18n/es.po
index a1f682c220a..86b83ce416f 100644
--- a/addons/analytic_journal_billing_rate/i18n/es.po
+++ b/addons/analytic_journal_billing_rate/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/es_AR.po b/addons/analytic_journal_billing_rate/i18n/es_AR.po
index ed67a339178..6e1bbe3c18f 100644
--- a/addons/analytic_journal_billing_rate/i18n/es_AR.po
+++ b/addons/analytic_journal_billing_rate/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/et.po b/addons/analytic_journal_billing_rate/i18n/et.po
index 710925c258e..95a0c4a3da6 100644
--- a/addons/analytic_journal_billing_rate/i18n/et.po
+++ b/addons/analytic_journal_billing_rate/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/fr.po b/addons/analytic_journal_billing_rate/i18n/fr.po
index d0940898423..ad78c603046 100644
--- a/addons/analytic_journal_billing_rate/i18n/fr.po
+++ b/addons/analytic_journal_billing_rate/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/gl.po b/addons/analytic_journal_billing_rate/i18n/gl.po
index 491644215c1..085e4a81f2b 100644
--- a/addons/analytic_journal_billing_rate/i18n/gl.po
+++ b/addons/analytic_journal_billing_rate/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/hr.po b/addons/analytic_journal_billing_rate/i18n/hr.po
index 15fa3a27259..2af5a462cc5 100644
--- a/addons/analytic_journal_billing_rate/i18n/hr.po
+++ b/addons/analytic_journal_billing_rate/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/hu.po b/addons/analytic_journal_billing_rate/i18n/hu.po
index 30ad37bff7a..41af5a0e7dc 100644
--- a/addons/analytic_journal_billing_rate/i18n/hu.po
+++ b/addons/analytic_journal_billing_rate/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po
index 5a2b6577e27..0ba7e87a53c 100644
--- a/addons/analytic_journal_billing_rate/i18n/id.po
+++ b/addons/analytic_journal_billing_rate/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/it.po b/addons/analytic_journal_billing_rate/i18n/it.po
index 154fe2f4a1d..43e78a1757a 100644
--- a/addons/analytic_journal_billing_rate/i18n/it.po
+++ b/addons/analytic_journal_billing_rate/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ko.po b/addons/analytic_journal_billing_rate/i18n/ko.po
index 8669a629e93..9c9c4563cd0 100644
--- a/addons/analytic_journal_billing_rate/i18n/ko.po
+++ b/addons/analytic_journal_billing_rate/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/lt.po b/addons/analytic_journal_billing_rate/i18n/lt.po
index eb75b54c989..a9148e523a7 100644
--- a/addons/analytic_journal_billing_rate/i18n/lt.po
+++ b/addons/analytic_journal_billing_rate/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/nl.po b/addons/analytic_journal_billing_rate/i18n/nl.po
index ac1bb683fd8..063ad71f5b3 100644
--- a/addons/analytic_journal_billing_rate/i18n/nl.po
+++ b/addons/analytic_journal_billing_rate/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/nl_BE.po b/addons/analytic_journal_billing_rate/i18n/nl_BE.po
index aa59c529211..f4eb5986127 100644
--- a/addons/analytic_journal_billing_rate/i18n/nl_BE.po
+++ b/addons/analytic_journal_billing_rate/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/pl.po b/addons/analytic_journal_billing_rate/i18n/pl.po
index 985a1589694..8db7a6b4107 100644
--- a/addons/analytic_journal_billing_rate/i18n/pl.po
+++ b/addons/analytic_journal_billing_rate/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/pt.po b/addons/analytic_journal_billing_rate/i18n/pt.po
index efb40a3f0ac..b71c39810e3 100644
--- a/addons/analytic_journal_billing_rate/i18n/pt.po
+++ b/addons/analytic_journal_billing_rate/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/pt_BR.po b/addons/analytic_journal_billing_rate/i18n/pt_BR.po
index a57a7d2e632..fff18b70130 100644
--- a/addons/analytic_journal_billing_rate/i18n/pt_BR.po
+++ b/addons/analytic_journal_billing_rate/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ro.po b/addons/analytic_journal_billing_rate/i18n/ro.po
index 6b88e0c34a4..042c898c002 100644
--- a/addons/analytic_journal_billing_rate/i18n/ro.po
+++ b/addons/analytic_journal_billing_rate/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ru.po b/addons/analytic_journal_billing_rate/i18n/ru.po
index 155f1ae7eee..ff4c1561b23 100644
--- a/addons/analytic_journal_billing_rate/i18n/ru.po
+++ b/addons/analytic_journal_billing_rate/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/sl.po b/addons/analytic_journal_billing_rate/i18n/sl.po
index 9674880f2bb..5b44b9be3c7 100644
--- a/addons/analytic_journal_billing_rate/i18n/sl.po
+++ b/addons/analytic_journal_billing_rate/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/sv.po b/addons/analytic_journal_billing_rate/i18n/sv.po
index 36b3b698058..ede75c184cd 100644
--- a/addons/analytic_journal_billing_rate/i18n/sv.po
+++ b/addons/analytic_journal_billing_rate/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/tlh.po b/addons/analytic_journal_billing_rate/i18n/tlh.po
index 4b694d34c41..14739063b42 100644
--- a/addons/analytic_journal_billing_rate/i18n/tlh.po
+++ b/addons/analytic_journal_billing_rate/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index a49a0dbb3d2..5832f2366bc 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/uk.po b/addons/analytic_journal_billing_rate/i18n/uk.po
index 17d52275623..a808257a379 100644
--- a/addons/analytic_journal_billing_rate/i18n/uk.po
+++ b/addons/analytic_journal_billing_rate/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_CN.po b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
index f22e1be37d3..9b573df64fb 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_CN.po
+++ b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_TW.po b/addons/analytic_journal_billing_rate/i18n/zh_TW.po
index c07dce7313d..b9db17a4429 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_TW.po
+++ b/addons/analytic_journal_billing_rate/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/__terp__.py b/addons/analytic_user_function/__openerp__.py
similarity index 100%
rename from addons/analytic_user_function/__terp__.py
rename to addons/analytic_user_function/__openerp__.py
diff --git a/addons/analytic_user_function/i18n/ar.po b/addons/analytic_user_function/i18n/ar.po
index 13979ecab5e..8aa2beb0da4 100644
--- a/addons/analytic_user_function/i18n/ar.po
+++ b/addons/analytic_user_function/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/bg.po b/addons/analytic_user_function/i18n/bg.po
index 86f57c254d0..5e8df2b21d8 100644
--- a/addons/analytic_user_function/i18n/bg.po
+++ b/addons/analytic_user_function/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/bs.po b/addons/analytic_user_function/i18n/bs.po
index 34c2a7acf25..3bad0f33a0e 100644
--- a/addons/analytic_user_function/i18n/bs.po
+++ b/addons/analytic_user_function/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/ca.po b/addons/analytic_user_function/i18n/ca.po
index 098e91b78bf..0088f40d8bd 100644
--- a/addons/analytic_user_function/i18n/ca.po
+++ b/addons/analytic_user_function/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/cs.po b/addons/analytic_user_function/i18n/cs.po
index 5b64cf6f042..fb6d74b5a90 100644
--- a/addons/analytic_user_function/i18n/cs.po
+++ b/addons/analytic_user_function/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index 844af118a6f..201c364d4b8 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index eaf9b142d98..8638e07e71e 100644
--- a/addons/analytic_user_function/i18n/el.po
+++ b/addons/analytic_user_function/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index 293a2661987..6e0ed57d321 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/es_AR.po b/addons/analytic_user_function/i18n/es_AR.po
index c2bd4e9d196..2b1f0b83a9b 100644
--- a/addons/analytic_user_function/i18n/es_AR.po
+++ b/addons/analytic_user_function/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/et.po b/addons/analytic_user_function/i18n/et.po
index 2fd92590d58..82a1e5bb704 100644
--- a/addons/analytic_user_function/i18n/et.po
+++ b/addons/analytic_user_function/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index 8b38f6f5f28..9a892359b57 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/gl.po b/addons/analytic_user_function/i18n/gl.po
index 9319bf4e125..df643d30821 100644
--- a/addons/analytic_user_function/i18n/gl.po
+++ b/addons/analytic_user_function/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po
index e3f0ad4eaca..458e187eafe 100644
--- a/addons/analytic_user_function/i18n/hr.po
+++ b/addons/analytic_user_function/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/analytic_user_function/i18n/hu.po b/addons/analytic_user_function/i18n/hu.po
index 13979ecab5e..8aa2beb0da4 100644
--- a/addons/analytic_user_function/i18n/hu.po
+++ b/addons/analytic_user_function/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/id.po b/addons/analytic_user_function/i18n/id.po
index b9210646d74..0bb6d48654c 100644
--- a/addons/analytic_user_function/i18n/id.po
+++ b/addons/analytic_user_function/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index 081e5329c52..735d3f5559b 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po
index f712ef2ba23..8577f274c8e 100644
--- a/addons/analytic_user_function/i18n/ko.po
+++ b/addons/analytic_user_function/i18n/ko.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: 2009-09-08 16:01+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-04-15 01:01+0000\n"
+"Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -35,7 +35,7 @@ msgstr "상품"
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "분석 계정"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
@@ -57,7 +57,7 @@ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
-msgstr ""
+msgstr "사용자 함수 분석"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
diff --git a/addons/analytic_user_function/i18n/lt.po b/addons/analytic_user_function/i18n/lt.po
index cc6d51e3aba..922affc88f5 100644
--- a/addons/analytic_user_function/i18n/lt.po
+++ b/addons/analytic_user_function/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index 64966f881ed..f9e7a9ff460 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/pl.po b/addons/analytic_user_function/i18n/pl.po
index 6d049f567a9..c7bcf40a6f4 100644
--- a/addons/analytic_user_function/i18n/pl.po
+++ b/addons/analytic_user_function/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index b61265d82b5..ddd305722d0 100644
--- a/addons/analytic_user_function/i18n/pt.po
+++ b/addons/analytic_user_function/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index be35271e628..68c2608522e 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/ro.po b/addons/analytic_user_function/i18n/ro.po
index 2b697c2c1ae..0d4e109e869 100644
--- a/addons/analytic_user_function/i18n/ro.po
+++ b/addons/analytic_user_function/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/ru.po b/addons/analytic_user_function/i18n/ru.po
index 4620d48fa44..dba8c233370 100644
--- a/addons/analytic_user_function/i18n/ru.po
+++ b/addons/analytic_user_function/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 09:18+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-16 13:24+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -24,28 +24,28 @@ msgstr "Неправильный XML для просмотра архитект
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
-msgstr ""
+msgstr "Таблица связи между пользователем и продуктом для счёта аналитики"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Продукт"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Счет аналитического учета"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "Пользователь/Свяь в продукцией"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: analytic_user_function
 #: constraint:ir.model:0
@@ -58,9 +58,9 @@ msgstr ""
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
-msgstr ""
+msgstr "Пользовательская функция аналитики"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "Продуктв пользователей для счета аналитики"
diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po
index 05c2f2561a7..4fedb3d1719 100644
--- a/addons/analytic_user_function/i18n/sk.po
+++ b/addons/analytic_user_function/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po
index aa83b3b293f..e73978a1d65 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index 30a60964808..e37c2172fcb 100644
--- a/addons/analytic_user_function/i18n/sv.po
+++ b/addons/analytic_user_function/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/tlh.po b/addons/analytic_user_function/i18n/tlh.po
index fbb9bfbccbb..071019e04f0 100644
--- a/addons/analytic_user_function/i18n/tlh.po
+++ b/addons/analytic_user_function/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index ca5b53c8be8..27d1ead17b4 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/uk.po b/addons/analytic_user_function/i18n/uk.po
index 7fdcf6b48ca..beec55c7b43 100644
--- a/addons/analytic_user_function/i18n/uk.po
+++ b/addons/analytic_user_function/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index f8df542b6e5..cc4b18508c6 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/zh_TW.po b/addons/analytic_user_function/i18n/zh_TW.po
index 4e781171788..83802a9377a 100644
--- a/addons/analytic_user_function/i18n/zh_TW.po
+++ b/addons/analytic_user_function/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/association/__terp__.py b/addons/association/__openerp__.py
similarity index 100%
rename from addons/association/__terp__.py
rename to addons/association/__openerp__.py
diff --git a/addons/auction/__terp__.py b/addons/auction/__openerp__.py
similarity index 100%
rename from addons/auction/__terp__.py
rename to addons/auction/__openerp__.py
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index cf5f27775df..b7a379cd387 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -481,10 +481,11 @@ class auction_lots(osv.osv):
         return result
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context={}):
-        if not args:
+        if not len(args):
             args = []
-
-        ids = self.search(cr, user, [('obj_num','=',int(name))] + args)
+        ids = []
+        if name:
+            ids = self.search(cr, user, [('obj_num','=',int(name))] + args)
         if not ids:
             ids = self.search(cr, user, [('name',operator,name)] + args)
         return self.name_get(cr, user, ids)
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index ee1004ab0f3..c65cd6d8451 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -1,1012 +1,1012 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-	<menuitem name="Auction Management" id="auction_menu_root" icon="terp-purchase"/>
-	<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
-	<menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
+    <menuitem name="Auction Management" id="auction_menu_root" icon="terp-purchase"/>
+    <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
+    <menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
     <menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
-	=======================================================
-	Auction Management/Configuration/artist
-	=======================================================
-	<record model="ir.ui.view" id="view_auction_artist_tree">
-		<field name="name">auction.artists.tree</field>
-		<field name="model">auction.artists</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Artists">
-			<field name="name"/>
-				<field name="birth_death_dates"/>
-				<field name="biography"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_auction_artist_form">
-		<field name="name">auction.artists.form</field>
-		<field name="model">auction.artists</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Artists">
-				<field colspan="4" name="name" select="1"/>
-				<field colspan="4" name="pseudo" select="1"/>
-					<newline/>
-				<field colspan="4" name="birth_death_dates"/>
-					<newline/>
-				<field colspan="4" name="biography"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_auction_artist">
-		<field name="res_model">auction.artists</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="view_auction_artist_tree"/>
-	</record>
-	<menuitem name="Define Artists" parent="auction_config_menu" action="action_auction_artist" id="menu_auction_artist"/>
+    =======================================================
+    Auction Management/Configuration/artist
+    =======================================================
+    <record model="ir.ui.view" id="view_auction_artist_tree">
+        <field name="name">auction.artists.tree</field>
+        <field name="model">auction.artists</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Artists">
+            <field name="name"/>
+                <field name="birth_death_dates"/>
+                <field name="biography"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_auction_artist_form">
+        <field name="name">auction.artists.form</field>
+        <field name="model">auction.artists</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Artists">
+                <field colspan="4" name="name" select="1"/>
+                <field colspan="4" name="pseudo" select="1"/>
+                    <newline/>
+                <field colspan="4" name="birth_death_dates"/>
+                    <newline/>
+                <field colspan="4" name="biography"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_auction_artist">
+        <field name="res_model">auction.artists</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_auction_artist_tree"/>
+    </record>
+    <menuitem name="Define Artists" parent="auction_config_menu" action="action_auction_artist" id="menu_auction_artist"/>
 
-	=======================================================
-	Auction Management/Configuration/objectcategories
-	=======================================================
-	<record model="ir.ui.view" id="view_auction_object_categories_tree">
-		<field name="name">auction.lot.category.tree</field>
-		<field name="model">auction.lot.category</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-				<tree string="Lot Category">
-					<field name="name"/>
-				</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_auction_object_categories_form">
-		<field name="name">auction.lot.category.form</field>
-		<field name="model">auction.lot.category</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-				<form string="Lot Category">
-					<field name="name" colspan="4" select="1"/>
-					<newline/>
-					<field name="aie_categ" colspan="4"/>
-					<field name="priority"/>
-					<newline/>
-					<field name="active" select="2"/>
-				</form>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_auction_object_categories">
-		<field name="res_model">auction.lot.category</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="view_auction_object_categories_tree"/>
-	</record>
-	<menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" id="menu_auction_object_cat"/>
-	=======================================================
+    =======================================================
+    Auction Management/Configuration/objectcategories
+    =======================================================
+    <record model="ir.ui.view" id="view_auction_object_categories_tree">
+        <field name="name">auction.lot.category.tree</field>
+        <field name="model">auction.lot.category</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+                <tree string="Lot Category">
+                    <field name="name"/>
+                </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_auction_object_categories_form">
+        <field name="name">auction.lot.category.form</field>
+        <field name="model">auction.lot.category</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+                <form string="Lot Category">
+                    <field name="name" colspan="4" select="1"/>
+                    <newline/>
+                    <field name="aie_categ" colspan="4"/>
+                    <field name="priority"/>
+                    <newline/>
+                    <field name="active"/>
+                </form>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_auction_object_categories">
+        <field name="res_model">auction.lot.category</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_auction_object_categories_tree"/>
+    </record>
+    <menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" id="menu_auction_object_cat"/>
+    =======================================================
     Auction Management/Auction Dates/New Auction Dates
-	=======================================================
-	<record model="ir.ui.view" id="view_auction_dates_tree">
-		<field name="name">Auction dates</field>
-		<field name="model">auction.dates</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Auction Dates">
-				<field name="auction1" string="Beginning of the auction"/>
-				<field name="auction2" string="End of auction"/>
-				<field name="name" string="Names"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_auction_dates_form">
-		<field name="name">Auction dates</field>
-		<field name="model">auction.dates</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Auctions">
-				<field name="name" colspan="2" select="1"/>
-				<separator string="Dates" colspan="4"/>
-				<field name="expo1"/>
-				<field name="expo2"/>
-				<field name="auction1" select="1"/>
-				<field name="auction2" select="1"/>
-				<separator string="Commissions" colspan="4"/>
-				<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','&lt;&gt;','purchase')]"/>
-				<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','&lt;&gt;','sale')]"/>
-				<separator string="Accounting" colspan="4"/>
-				<field name="acc_expense"/>
-				<field name="acc_income"/>
-				<separator string="Analytic" colspan="4"/>
-				<field name="journal_id"/>
-				<field name="journal_seller_id"/>
-				<field name="account_analytic_id"/>
-				<separator string="State" colspan="4"/>
-				<field name="state"/>
-				<button name="close" states="draft" string="Close + Create all invoices" type="object" colspan="2" icon="gtk-print"/>
-			</form>
-		</field>
-	</record>
+    =======================================================
+    <record model="ir.ui.view" id="view_auction_dates_tree">
+        <field name="name">Auction dates</field>
+        <field name="model">auction.dates</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Auction Dates">
+                <field name="auction1" string="Beginning of the auction"/>
+                <field name="auction2" string="End of auction"/>
+                <field name="name" string="Names"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_auction_dates_form">
+        <field name="name">Auction dates</field>
+        <field name="model">auction.dates</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Auctions">
+                <field name="name" colspan="2" select="1"/>
+                <separator string="Dates" colspan="4"/>
+                <field name="expo1"/>
+                <field name="expo2"/>
+                <field name="auction1" select="1"/>
+                <field name="auction2" select="1"/>
+                <separator string="Commissions" colspan="4"/>
+                <field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','&lt;&gt;','purchase')]"/>
+                <field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','&lt;&gt;','sale')]"/>
+                <separator string="Accounting" colspan="4"/>
+                <field name="acc_expense"/>
+                <field name="acc_income"/>
+                <separator string="Analytic" colspan="4"/>
+                <field name="journal_id"/>
+                <field name="journal_seller_id"/>
+                <field name="account_analytic_id"/>
+                <separator string="State" colspan="4"/>
+                <field name="state"/>
+                <button name="close" states="draft" string="Close + Create all invoices" type="object" colspan="2" icon="gtk-print"/>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_auction_dates_next">
-		<field name="name">Next Auctions</field>
-		<field name="res_model">auction.dates</field>
-		<field name="view_type">form</field>
-		<field name="domain">[('state','=','draft')]</field>
-		<field name="view_id" eval="False"/>
-	</record>
+    <record model="ir.actions.act_window" id="action_auction_dates_next">
+        <field name="name">Next Auctions</field>
+        <field name="res_model">auction.dates</field>
+        <field name="view_type">form</field>
+        <field name="domain">[('state','=','draft')]</field>
+        <field name="view_id" eval="False"/>
+    </record>
 
-	<menuitem name="Auction Dates" parent="auction_menu_root" id="auction_date_menu" sequence="1"/>
-	<menuitem name="Next Auction Dates" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
-	=======================================================
-	Auction Management/Auction Dates/Old Auction Dates
-	=======================================================
-	<record model="ir.actions.act_window" id="action_auction_dates_old">
-		<field name="name">Old Auctions</field>
-		<field name="res_model">auction.dates</field>
-		<field name="view_type">form</field>
-		<field name="domain">[('state','=','closed')]</field>
-		<field name="view_id" ref="view_auction_dates_tree"/>
-		<field name="filter" eval="True"/>
-	</record>
+    <menuitem name="Auction Dates" parent="auction_menu_root" id="auction_date_menu" sequence="1"/>
+    <menuitem name="Next Auction Dates" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
+    =======================================================
+    Auction Management/Auction Dates/Old Auction Dates
+    =======================================================
+    <record model="ir.actions.act_window" id="action_auction_dates_old">
+        <field name="name">Old Auctions</field>
+        <field name="res_model">auction.dates</field>
+        <field name="view_type">form</field>
+        <field name="domain">[('state','=','closed')]</field>
+        <field name="view_id" ref="view_auction_dates_tree"/>
+        <field name="filter" eval="True"/>
+    </record>
 
     =======================================================
     Auction Management/Auction Dates/Reporting
-	=======================================================
-	<!-- tree1 form1 for NEW object in the deposit border -->
-	<record model="ir.ui.view" id="v5">
-		<field name="name">Auction lots</field>
-		<field name="model">auction.lots</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-				<tree string="Auction Objects">
-					<field name="lot_num"/>
-					<field name="obj_num"/>
-					<field name="name"/>
-					<field name="auction_id"/>
-					<field name="vnd_lim"/>
-					<field name="lot_est1"/>
-					<field name="lot_est2"/>
-					<field name="buyer_price"/>
-					<field name="is_ok"/>
-					<field name="seller_price"/>
-					<field name="gross_revenue"/>
-					<field name="net_revenue"/>
-					<field name="gross_margin"/>
-					<field name="net_margin"/>
-					<field name="costs"/>
-					<field name="obj_price_l"/>
+    =======================================================
+    <!-- tree1 form1 for NEW object in the deposit border -->
+    <record model="ir.ui.view" id="v5">
+        <field name="name">Auction lots</field>
+        <field name="model">auction.lots</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+                <tree string="Auction Objects">
+                    <field name="lot_num"/>
+                    <field name="obj_num"/>
+                    <field name="name"/>
+                    <field name="auction_id"/>
+                    <field name="vnd_lim"/>
+                    <field name="lot_est1"/>
+                    <field name="lot_est2"/>
+                    <field name="buyer_price"/>
+                    <field name="is_ok"/>
+                    <field name="seller_price"/>
+                    <field name="gross_revenue"/>
+                    <field name="net_revenue"/>
+                    <field name="gross_margin"/>
+                    <field name="net_margin"/>
+                    <field name="costs"/>
+                    <field name="obj_price_l"/>
 
-				</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="auction_lot_simplified">
-		<field name="name">Auction lots</field>
-		<field name="model">auction.lots</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Catalog">
-				<field name="auction_id"/>
-				<field name="obj_num"/>
-				<field name="bord_vnd_id"/>
-				<field name="lot_num"/>
-				<field name="buyer_price"/>
-				<field name="seller_price"/>
-				<field name="gross_revenue"/>
-				<field name="net_revenue"/>
-				<field name="gross_margin"/>
-				<field name="net_margin"/>
-				<field name="costs"/>
-				<newline/>
-				<field name="name"/>
-				<field name="lot_type" select="1"/>
-				<field name="name2"/>
-				<newline/>
-				<field name="artist_id"/>
-				<field name="artist2_id"/>
-				<field name="obj_desc" colspan="4"/>
-				<field name="vnd_lim"/>
-				<field name="vnd_lim_net"/>
-				<field name="lot_est1"/>
-				<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
-				<field name="lot_est2"/>
-				<field name="product_id"/>
-				<field name="state" readonly="1"/>
-				
-			</form>
-		</field>
-	</record>
+                </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="auction_lot_simplified">
+        <field name="name">Auction lots</field>
+        <field name="model">auction.lots</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Catalog">
+                <field name="auction_id"/>
+                <field name="obj_num"/>
+                <field name="bord_vnd_id"/>
+                <field name="lot_num"/>
+                <field name="buyer_price"/>
+                <field name="seller_price"/>
+                <field name="gross_revenue"/>
+                <field name="net_revenue"/>
+                <field name="gross_margin"/>
+                <field name="net_margin"/>
+                <field name="costs"/>
+                <newline/>
+                <field name="name"/>
+                <field name="lot_type" select="1"/>
+                <field name="name2"/>
+                <newline/>
+                <field name="artist_id"/>
+                <field name="artist2_id"/>
+                <field name="obj_desc" colspan="4"/>
+                <field name="vnd_lim"/>
+                <field name="vnd_lim_net"/>
+                <field name="lot_est1"/>
+                <field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
+                <field name="lot_est2"/>
+                <field name="product_id"/>
+                <field name="state" readonly="1"/>
+                
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="auction_lot_graph">
-		<field name="name">Auction lots</field>
-		<field name="model">auction.lots</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Lots" type="bar">
-				<field name="lot_type"/>
-				<field name="lot_est1" operator="+"/>
-				<field name="lot_est2" operator="+"/>
-				<field name="obj_price" operator="+"/>
-			</graph>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="auction_lot_graph">
+        <field name="name">Auction lots</field>
+        <field name="model">auction.lots</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Lots" type="bar">
+                <field name="lot_type"/>
+                <field name="lot_est1" operator="+"/>
+                <field name="lot_est2" operator="+"/>
+                <field name="obj_price" operator="+"/>
+            </graph>
+        </field>
+    </record>
 
 
-	<!-- tree2 form2 for Catalog, All object and Unclassified objects -->
-	<record model="ir.ui.view" id="v7">
-		<field name="name">Auction lots</field>
-		<field name="model">auction.lots</field>
-		<field name="type">tree</field>
-		<field name="priority" eval="1"/>
-		<field name="arch" type="xml">
-			<tree string="Catalog">
-				<field name="obj_num" string="Ref" select="1"/>
-				<field name="name" select="1"/>
-				<field name="ach_login"/>
-				<field name="obj_price" sum="Total Adj."/>
-				<field name="state" select="1"/>
-				<field name="obj_comm"/>
-				<field name="bord_vnd_id"/>
-				<field name="lot_num"/>
-				<field name="lot_est1"/>
-				<field name="lot_est2"/>
-				<field name="lot_type" select="1"/>
-				<field name="auction_id"/>
-			</tree>
-		</field>
-	</record>
+    <!-- tree2 form2 for Catalog, All object and Unclassified objects -->
+    <record model="ir.ui.view" id="v7">
+        <field name="name">Auction lots</field>
+        <field name="model">auction.lots</field>
+        <field name="type">tree</field>
+        <field name="priority" eval="1"/>
+        <field name="arch" type="xml">
+            <tree string="Catalog">
+                <field name="obj_num" string="Ref" select="1"/>
+                <field name="name" select="1"/>
+                <field name="ach_login"/>
+                <field name="obj_price" sum="Total Adj."/>
+                <field name="state" select="1"/>
+                <field name="obj_comm"/>
+                <field name="bord_vnd_id"/>
+                <field name="lot_num"/>
+                <field name="lot_est1"/>
+                <field name="lot_est2"/>
+                <field name="lot_type" select="1"/>
+                <field name="auction_id"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="auction_lot_detailed">
-		<field name="name">Auction lots</field>
-		<field name="model">auction.lots</field>
-		<field name="type">form</field>
-		<field name="priority" eval="8"/>
-		<field name="arch" type="xml">
-			<form string="Catalog">
-				<notebook>
+    <record model="ir.ui.view" id="auction_lot_detailed">
+        <field name="name">Auction lots</field>
+        <field name="model">auction.lots</field>
+        <field name="type">form</field>
+        <field name="priority" eval="8"/>
+        <field name="arch" type="xml">
+            <form string="Catalog">
+                <notebook>
 
-				<page string="Object">
-					<group colspan="2" col="2">
-						<field name="obj_num" select="1"/>
-						<field name="name" select="1"/>
-						<field name="name2" select="2"/>
-						<field name="artist_id" select="2"/>
-						<field name="artist2_id"/>
-						<field name="product_id"/>
-					</group>
-					<field widget="image" name="image" nolabel="1" colspan="2"/>
-					<field name="lot_est1" select="2"/>
-					<field name="lot_est2"/>
-					<field name="auction_id" colspan="2" select="1"/>
-					<field name="lot_type" select="2"/>
-					<field name="lot_local"/>
+                <page string="Object">
+                    <group colspan="2" col="2">
+                        <field name="obj_num" select="1"/>
+                        <field name="name" select="1"/>
+                        <field name="name2"/>
+                        <field name="artist_id"/>
+                        <field name="artist2_id"/>
+                        <field name="product_id"/>
+                    </group>
+                    <field widget="image" name="image" nolabel="1" colspan="2"/>
+                    <field name="lot_est1"/>
+                    <field name="lot_est2"/>
+                    <field name="auction_id" colspan="2" select="1"/>
+                    <field name="lot_type"/>
+                    <field name="lot_local"/>
 
-					<field name="bord_vnd_id" select="1"/>
-					<field name="lot_num"/>
+                    <field name="bord_vnd_id" select="1"/>
+                    <field name="lot_num"/>
 
-					<separator string="Description" colspan="4"/>
-					<field name="obj_desc" colspan="4" nolabel="1" select="2"/>
-					<field name="state" colspan="1" select="2"/>
-				 	<group col="8" colspan="2">
-				 	   <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
+                    <separator string="Description" colspan="4"/>
+                    <field name="obj_desc" colspan="4" nolabel="1"/>
+                    <field name="state" colspan="1"/>
+                     <group col="8" colspan="2">
+                        <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
                        <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
                        <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
                        <button name="button_draft" string="Set to draft" states="sold,unsold" type="object" icon="gtk-convert"/>
                        <button name="button_unpaid" string="Set to draft" states="paid" type="object" icon="gtk-convert"/>
-					</group>
-				</page>
-
-				<page string="Seller">
-					<separator string="Seller information" colspan="4"/>
-
-					<field name="vnd_lim"/>
-					<field name="vnd_lim_net"/>
-					<field name="sel_inv_id"/>
-					<field name="paid_vnd"/>
-					<field name="history_ids" colspan="4" readonly="1">
-						<tree string="History">
-							<field name="name"/>
-							<field name="lot_id"/>
-							<field name="auction_id"/>
-							<field name="price"/>
-						</tree>
-					</field>
-					</page>
-				<page string="Buyer">
-					<separator string="Buyer information" colspan="4"/>
-					<field name="ach_uid"  select="2"/>
-					<field name="ach_login" select="1" />
-					<field name="obj_price" select="2"/>
-					<field name="obj_comm" select="2"/>
-					<field name="obj_ret"/>
-					<field name="ach_emp"/>
-					<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
-					<field name="buyer_price"/>
-					<field name="seller_price"/>
-					<field name="gross_revenue"/>
-					<field name="net_revenue"/>
-					<field name="gross_margin"/>
-					<field name="net_margin"/>
-					<field name="costs"/>
-					<newline/>
-					<field name="ach_inv_id"/>
-					<field name="paid_ach"/>
-					<field name="is_ok" select="2"/>
-					<field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
-						widget="one2many_list">
-						<tree string="Payment's history">
-							<field name="statement_id"/>
-							<field name="amount"/>
-							<field name="date"/>
-						</tree>
-					</field>
-				</page>
-			<page string="Bids">
-				<field name="bid_lines" colspan="4" nolabel="1" editable="top">
-						<tree string="Bids"  editable="top">
-							<field name="bid_id"/>
-							<field name="price"/>
-							<field name="call"/>
-						</tree>
-					</field>
-			</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
-
-
-
-	<record model="ir.actions.act_window" id="action_all_objects">
-		<field name="res_model">auction.lots</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-
-	<record model="ir.actions.act_window" id="action_all_objects_sold">
-		<field name="name">Sold Objects</field>
-		<field name="res_model">auction.lots</field>
-		<field name="view_type">form</field>
-		<field name="domain">[('state','=','sold')]</field>
-        <field name="filter" eval="True"/>
-	</record>
-
-	<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu" sequence="2"/>
-	<menuitem name="All objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
-
-	<record model="ir.actions.act_window" id="action_all_objects_to_sell">
-		<field name="name">Objects to sell</field>
-		<field name="res_model">auction.lots</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('state','&lt;&gt;','sold')]</field>
-        <field name="filter" eval="True"/>
-	</record>
-
-	<record model="ir.actions.act_window" id="action_all_objects_unplanned">
-		<field name="name">Unplanned objects</field>
-		<field name="res_model">auction.lots</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('auction_id','=', False),('state','=','draft')]</field>
-        <field name="filter" eval="True"/>
-	</record>
-
-	<!--		for the sold object  start-->
-
-	<record model="ir.actions.act_window" id="action_all_objects_unsold">
-		<field name="name">Unsold objects</field>
-		<field name="res_model">auction.lots</field>
-		<field name="view_type">form</field>
-		<field name="domain">[('state','=','unsold')]</field>
-        <field name="filter" eval="True"/>
-	</record>
-
-	<!-- form3: simplified form meant for during the sale (action button in dates) -->
-	<!--form par defaut-->
-	<record model="ir.ui.view" id="auction_lots_sell_form">
-		<field name="name">auction.lots.form3</field>
-		<field name="model">auction.lots</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Auction">
-				<notebook>
-				<page string="Auction">
-					<field name="obj_num" readonly="1" select="1"/>
-					<field name="auction_id" select="2"/>
-					<field name="obj_price" select="1"/>
-					<field name="ach_login" select="1" comparator="="/>
-					<field name="ach_emp"/>
-					<field name="obj_comm"/>
-					<field name="obj_ret" on_change="onchange_obj_ret(obj_ret)"/>
-					<newline/>
-					<field name="name" readonly="1" select="1"/>
-					<field name="name2" readonly="2" select="1"/>
-					<field name="artist_id" readonly="1"/>
-					<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
-					<newline/>
-					<field name="buyer_price"/>
-					<field name="is_ok" select="1"/>
-					<field name="obj_desc" readonly="1" colspan="4"/>
-					<field name="lot_est1" readonly="1"/>
-					<field name="lot_est2" readonly="1"/>
-					<field name="vnd_lim" readonly="1"/>
-					<field name="vnd_lim_net"/>
-					<field name="bid_lines" colspan="4" readonly="1">
-						<tree string="Bids">
-							<field name="name"/>
-							<field name="bid_id"/>
-							<field name="price"/>
-							<field name="call"/>
-						</tree>
-					</field>
-					<field name="state" readonly="1"/>
-					<group colspan="2" col="4">
-	                    <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to" />
-	                    <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
-	                    <button name="button_draft" string="Set to draft" states="sold,unsold" type="object" icon="gtk-convert"/>
-	                    <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
                     </group>
-				</page>
-				<page string="Statements">
-					<field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
-						widget="one2many_list">
-						<tree string="Payment's history" editable="top">
-							<field name="name"/>
-							<field name="amount"/>
-							<field name="date"/>
-				</tree>
-					</field>
-				</page>
-			</notebook>
-			</form>
-		</field>
-	</record>
+                </page>
+
+                <page string="Seller">
+                    <separator string="Seller information" colspan="4"/>
+
+                    <field name="vnd_lim"/>
+                    <field name="vnd_lim_net"/>
+                    <field name="sel_inv_id"/>
+                    <field name="paid_vnd"/>
+                    <field name="history_ids" colspan="4" readonly="1">
+                        <tree string="History">
+                            <field name="name"/>
+                            <field name="lot_id"/>
+                            <field name="auction_id"/>
+                            <field name="price"/>
+                        </tree>
+                    </field>
+                    </page>
+                <page string="Buyer">
+                    <separator string="Buyer information" colspan="4"/>
+                    <field name="ach_uid" />
+                    <field name="ach_login" select="1" />
+                    <field name="obj_price"/>
+                    <field name="obj_comm"/>
+                    <field name="obj_ret"/>
+                    <field name="ach_emp"/>
+                    <field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
+                    <field name="buyer_price"/>
+                    <field name="seller_price"/>
+                    <field name="gross_revenue"/>
+                    <field name="net_revenue"/>
+                    <field name="gross_margin"/>
+                    <field name="net_margin"/>
+                    <field name="costs"/>
+                    <newline/>
+                    <field name="ach_inv_id"/>
+                    <field name="paid_ach"/>
+                    <field name="is_ok"/>
+                    <field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
+                        widget="one2many_list">
+                        <tree string="Payment's history">
+                            <field name="statement_id"/>
+                            <field name="amount"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                </page>
+            <page string="Bids">
+                <field name="bid_lines" colspan="4" nolabel="1" editable="top">
+                        <tree string="Bids"  editable="top">
+                            <field name="bid_id"/>
+                            <field name="price"/>
+                            <field name="call"/>
+                        </tree>
+                    </field>
+            </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
 
 
-	=======================================================
-	Auction Management/seller
-	=======================================================
-	<record model="ir.actions.act_window" id="action_unclassified_objects">
-		<field name="name">Unclassified objects</field>
-		<field name="res_model">report.unclassified.objects</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
+
+    <record model="ir.actions.act_window" id="action_all_objects">
+        <field name="res_model">auction.lots</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_all_objects_sold">
+        <field name="name">Sold Objects</field>
+        <field name="res_model">auction.lots</field>
+        <field name="view_type">form</field>
+        <field name="domain">[('state','=','sold')]</field>
         <field name="filter" eval="True"/>
-	 </record>
+    </record>
 
-	<record model="ir.ui.view" id="v12">
-		<field name="name">Auction.deposit.tree</field>
-		<field name="model">auction.deposit</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Deposit Border">
-				<field name="name"/>
-				<field name="partner_id"/>
-				<field name="date_dep"/>
-			</tree>
-		</field>
-	</record>
+    <menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu" sequence="2"/>
+    <menuitem name="All objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
 
-	<record model="ir.ui.view" id="view_deposit_border_form">
-		<field name="name">auction.deposit.form</field>
-		<field name="model">auction.deposit</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Deposit Border Form">
-				<notebook>
-					<page string="General Informations">
-						<field name="name" select="1"/>
-						<field name="date_dep" select="1"/>
-						<field name="partner_id" select="1" on_change="partner_id_change(partner_id)"/>
-						<field name="method"/>
-						<newline/>
-						<field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-						<field name="transfer"/>
-						<newline/>
-						<field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
-							<tree string="Objects">
-								<field name="lot_num"/>
-								<field name="obj_num"/>
-								<field name="auction_id"/>
-								<field name="name"/>
-								<field name="obj_price"/>
-								<field name="vnd_lim"/>
-								<field name="lot_est1"/>
-								<field name="lot_est2"/>
-							</tree>
-							<form string="Objects">
-								<notebook colspan="4">
-								<page string="Description">
-									<field name="auction_id" colspan="4"/>
-									<field name="lot_num"/>
-									<field name="obj_num"/>
+    <record model="ir.actions.act_window" id="action_all_objects_to_sell">
+        <field name="name">Objects to sell</field>
+        <field name="res_model">auction.lots</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('state','&lt;&gt;','sold')]</field>
+        <field name="filter" eval="True"/>
+    </record>
 
-									<newline/>
-									<field name="name"/>
-									<field name="lot_type" select="1"/>
-									<field name="name2"/>
+    <record model="ir.actions.act_window" id="action_all_objects_unplanned">
+        <field name="name">Unplanned objects</field>
+        <field name="res_model">auction.lots</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('auction_id','=', False),('state','=','draft')]</field>
+        <field name="filter" eval="True"/>
+    </record>
 
-									<newline/>
-									<field name="artist_id"/>
-									<field name="artist2_id"/>
-									<field name="obj_desc" colspan="4"/>
-									<field name="vnd_lim"/>
-									<field name="vnd_lim_net"/>
-									<field name="lot_est1"/>
-									<field name="lot_est2"/>
+    <!--        for the sold object  start-->
 
-									<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
-									<field name="product_id" domain="[('sale_ok','=',True)]"/>
-									<field name="state" readonly="1"/>
-								</page><page string="Photos">
-									<field name="image" colspan="4" widget="image"/>
-								</page>
-								</notebook>
-							</form>
-						</field>
-					</page>
-					<page string="Extra Costs">
-						<field name="specific_cost_ids" widget="one2many_list" nolabel="1" colspan="4">
-							<tree string="Deposit Costs" editable="top">
-								<field name="name"/>
-								<field name="amount"/>
-								<field name="account" domain="[('type','=','income')]"/>
-							</tree>
-							<form string="Deposit Costs">
-								<field name="name"/>
-								<field name="amount"/>
-								<field name="account"/>
-							</form>
+    <record model="ir.actions.act_window" id="action_all_objects_unsold">
+        <field name="name">Unsold objects</field>
+        <field name="res_model">auction.lots</field>
+        <field name="view_type">form</field>
+        <field name="domain">[('state','=','unsold')]</field>
+        <field name="filter" eval="True"/>
+    </record>
 
-						</field>
-					</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
-
-	<record model="ir.ui.view" id="view_deposit_border_tree2">
-		<field name="name">Deposit border</field>
-		<field name="model">auction.deposit</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="">
-				<field name="name"/>
-				<field name="partner_id"/>
-				<field name="date_dep"/>
-				<field name="method"/>
-				<field name="tax_id"/>
-				<field name="info"/>
-
-			</tree>
-		</field>
-	</record>
-
-	<record model="ir.actions.act_window" id="action_deposit_border">
-		<field name="name">Deposit border</field>
-		<field name="res_model">auction.deposit</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="view_deposit_border_tree2"/>
-	</record>
-
-	<menuitem name="Sellers" id="auction_seller_menu" parent="auction_menu_root" sequence="3"/>
-	<menuitem name="Deposit border" parent="auction_seller_menu" action="action_deposit_border" id="menu_auction_deposit_border"/>
-
-	=======================================================
-		"Auction Management/Buyers/Bids
-	=======================================================
-	<record model="ir.ui.view" id="view_bids_tree">
-		<field name="name">auction.bid_line.tree1</field>
-		<field name="model">auction.bid_line</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Bids">
-				<field name="bid_id"/>
-			<!--	<field name="lot_id"/>-->
-				<field name="price"/>
-				<field name="call"/>
-				<field name="auction"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_bids_form">
-		<field name="name">auction.bid_line.form1</field>
-		<field name="model">auction.bid_line</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Bids">
-				<field name="bid_id" select="1"/>
-				<field name="lot_id" domain="[('auction_id','=',parent['auction_id'])]" on_change="onchange_name(lot_id)" colspan="4"/>
-				<field name="call" colspan="4" select="1"/>
-				<field name="price"/>
-				<!--field name="auction"/-->
-
-			</form>
-		</field>
-	</record>
+    <!-- form3: simplified form meant for during the sale (action button in dates) -->
+    <!--form par defaut-->
+    <record model="ir.ui.view" id="auction_lots_sell_form">
+        <field name="name">auction.lots.form3</field>
+        <field name="model">auction.lots</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Auction">
+                <notebook>
+                <page string="Auction">
+                    <field name="obj_num" readonly="1" select="1"/>
+                    <field name="auction_id"/>
+                    <field name="obj_price" select="1"/>
+                    <field name="ach_login" select="1" comparator="="/>
+                    <field name="ach_emp"/>
+                    <field name="obj_comm"/>
+                    <field name="obj_ret" on_change="onchange_obj_ret(obj_ret)"/>
+                    <newline/>
+                    <field name="name" readonly="1" select="1"/>
+                    <field name="name2" readonly="2" select="1"/>
+                    <field name="artist_id" readonly="1"/>
+                    <field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
+                    <newline/>
+                    <field name="buyer_price"/>
+                    <field name="is_ok" select="1"/>
+                    <field name="obj_desc" readonly="1" colspan="4"/>
+                    <field name="lot_est1" readonly="1"/>
+                    <field name="lot_est2" readonly="1"/>
+                    <field name="vnd_lim" readonly="1"/>
+                    <field name="vnd_lim_net"/>
+                    <field name="bid_lines" colspan="4" readonly="1">
+                        <tree string="Bids">
+                            <field name="name"/>
+                            <field name="bid_id"/>
+                            <field name="price"/>
+                            <field name="call"/>
+                        </tree>
+                    </field>
+                    <field name="state" readonly="1"/>
+                    <group colspan="2" col="4">
+                        <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to" />
+                        <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
+                        <button name="button_draft" string="Set to draft" states="sold,unsold" type="object" icon="gtk-convert"/>
+                        <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
+                    </group>
+                </page>
+                <page string="Statements">
+                    <field name="statement_id" domain="[('state','=','draft')]" colspan="4" nolabel="1"
+                        widget="one2many_list">
+                        <tree string="Payment's history" editable="top">
+                            <field name="name"/>
+                            <field name="amount"/>
+                            <field name="date"/>
+                </tree>
+                    </field>
+                </page>
+            </notebook>
+            </form>
+        </field>
+    </record>
 
 
-	<record model="ir.actions.act_window" id="b11">
-		<field name="res_model">auction.bid</field>
-		<field name="view_type">form</field>
-	</record>
+    =======================================================
+    Auction Management/seller
+    =======================================================
+    <record model="ir.actions.act_window" id="action_unclassified_objects">
+        <field name="name">Unclassified objects</field>
+        <field name="res_model">report.unclassified.objects</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="filter" eval="True"/>
+     </record>
+
+    <record model="ir.ui.view" id="v12">
+        <field name="name">Auction.deposit.tree</field>
+        <field name="model">auction.deposit</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Deposit Border">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="date_dep"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_deposit_border_form">
+        <field name="name">auction.deposit.form</field>
+        <field name="model">auction.deposit</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Deposit Border Form">
+                <notebook>
+                    <page string="General Informations">
+                        <field name="name" select="1"/>
+                        <field name="date_dep" select="1"/>
+                        <field name="partner_id" select="1" on_change="partner_id_change(partner_id)"/>
+                        <field name="method"/>
+                        <newline/>
+                        <field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                        <field name="transfer"/>
+                        <newline/>
+                        <field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
+                            <tree string="Objects">
+                                <field name="lot_num"/>
+                                <field name="obj_num"/>
+                                <field name="auction_id"/>
+                                <field name="name"/>
+                                <field name="obj_price"/>
+                                <field name="vnd_lim"/>
+                                <field name="lot_est1"/>
+                                <field name="lot_est2"/>
+                            </tree>
+                            <form string="Objects">
+                                <notebook colspan="4">
+                                <page string="Description">
+                                    <field name="auction_id" colspan="4"/>
+                                    <field name="lot_num"/>
+                                    <field name="obj_num"/>
+
+                                    <newline/>
+                                    <field name="name"/>
+                                    <field name="lot_type" select="1"/>
+                                    <field name="name2"/>
+
+                                    <newline/>
+                                    <field name="artist_id"/>
+                                    <field name="artist2_id"/>
+                                    <field name="obj_desc" colspan="4"/>
+                                    <field name="vnd_lim"/>
+                                    <field name="vnd_lim_net"/>
+                                    <field name="lot_est1"/>
+                                    <field name="lot_est2"/>
+
+                                    <field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
+                                    <field name="product_id" domain="[('sale_ok','=',True)]"/>
+                                    <field name="state" readonly="1"/>
+                                </page><page string="Photos">
+                                    <field name="image" colspan="4" widget="image"/>
+                                </page>
+                                </notebook>
+                            </form>
+                        </field>
+                    </page>
+                    <page string="Extra Costs">
+                        <field name="specific_cost_ids" widget="one2many_list" nolabel="1" colspan="4">
+                            <tree string="Deposit Costs" editable="top">
+                                <field name="name"/>
+                                <field name="amount"/>
+                                <field name="account" domain="[('type','=','income')]"/>
+                            </tree>
+                            <form string="Deposit Costs">
+                                <field name="name"/>
+                                <field name="amount"/>
+                                <field name="account"/>
+                            </form>
+
+                        </field>
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_deposit_border_tree2">
+        <field name="name">Deposit border</field>
+        <field name="model">auction.deposit</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="date_dep"/>
+                <field name="method"/>
+                <field name="tax_id"/>
+                <field name="info"/>
+
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_deposit_border">
+        <field name="name">Deposit border</field>
+        <field name="res_model">auction.deposit</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_deposit_border_tree2"/>
+    </record>
+
+    <menuitem name="Sellers" id="auction_seller_menu" parent="auction_menu_root" sequence="3"/>
+    <menuitem name="Deposit border" parent="auction_seller_menu" action="action_deposit_border" id="menu_auction_deposit_border"/>
+
+    =======================================================
+        "Auction Management/Buyers/Bids
+    =======================================================
+    <record model="ir.ui.view" id="view_bids_tree">
+        <field name="name">auction.bid_line.tree1</field>
+        <field name="model">auction.bid_line</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Bids">
+                <field name="bid_id"/>
+            <!--    <field name="lot_id"/>-->
+                <field name="price"/>
+                <field name="call"/>
+                <field name="auction"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_bids_form">
+        <field name="name">auction.bid_line.form1</field>
+        <field name="model">auction.bid_line</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Bids">
+                <field name="bid_id" select="1"/>
+                <field name="lot_id" domain="[('auction_id','=',parent['auction_id'])]" on_change="onchange_name(lot_id)" colspan="4"/>
+                <field name="call" colspan="4" select="1"/>
+                <field name="price"/>
+                <!--field name="auction"/-->
+
+            </form>
+        </field>
+    </record>
 
 
-	=======================================================
-		"Auction Management/Buyers/Reporting
-	=======================================================
+    <record model="ir.actions.act_window" id="b11">
+        <field name="res_model">auction.bid</field>
+        <field name="view_type">form</field>
+    </record>
 
-	<record model="ir.ui.view" id="v19">
-		<field name="name">auction.bid.form</field>
-		<field name="model">auction.bid</field>
-		<field name="arch" type="xml">
-			<form string="Bids">
-				<separator string="Bid information" colspan="4"/>
-				<field name="name" select="1"/>
-				<newline/>
-				<field name="partner_id" select="1" on_change="onchange_contact(partner_id)"/>
-				<field  name="contact_tel" select="2"/>
-				<field name="auction_id" select="1"/>
-				<field name="bid_lines" colspan="4">
-					<tree string="Bids" editable="bottom">
-						<field name="lot_id" domain="[('auction_id','=',parent.auction_id)]"/>
-						<field name="price"/>
-						<field name="call"/>
-					</tree>
-					<form string="Bids" editable="top">
-						<field name="lot_id" domain="[('auction_id','=',parent.auction_id)]"/>
-						<field name="price"/>
-						<field name="call"/>
-					</form>
 
-				</field>
-			</form>
-		</field>
-	</record>
+    =======================================================
+        "Auction Management/Buyers/Reporting
+    =======================================================
+
+    <record model="ir.ui.view" id="v19">
+        <field name="name">auction.bid.form</field>
+        <field name="model">auction.bid</field>
+        <field name="arch" type="xml">
+            <form string="Bids">
+                <separator string="Bid information" colspan="4"/>
+                <field name="name" select="1"/>
+                <newline/>
+                <field name="partner_id" select="1" on_change="onchange_contact(partner_id)"/>
+                <field  name="contact_tel"/>
+                <field name="auction_id" select="1"/>
+                <field name="bid_lines" colspan="4">
+                    <tree string="Bids" editable="bottom">
+                        <field name="lot_id" domain="[('auction_id','=',parent.auction_id)]"/>
+                        <field name="price"/>
+                        <field name="call"/>
+                    </tree>
+                    <form string="Bids" editable="top">
+                        <field name="lot_id" domain="[('auction_id','=',parent.auction_id)]"/>
+                        <field name="price"/>
+                        <field name="call"/>
+                    </form>
+
+                </field>
+            </form>
+        </field>
+    </record>
 
 
 
-	<record model="ir.ui.view" id="view_auction_bid_tree">
-		<field name="name">auction.bid.tree</field>
-		<field name="model">auction.bid</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Bids">
-				<field name="name"/>
-				<field name="auction_id"/>
-				<field name="partner_id"/>
-				<field name="contact_tel"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_auction_bid_tree">
+        <field name="name">auction.bid.tree</field>
+        <field name="model">auction.bid</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Bids">
+                <field name="name"/>
+                <field name="auction_id"/>
+                <field name="partner_id"/>
+                <field name="contact_tel"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_bid_open">
-		<field name="res_model">auction.bid</field>
-		<field name="view_mode">tree,form</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_bid_open">
+        <field name="res_model">auction.bid</field>
+        <field name="view_mode">tree,form</field>
+    </record>
 
-	<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
-	<menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
+    <menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
+    <menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
 
 
-	<record model="ir.actions.act_window" id="action_bids_form">
-		<field name="res_model">auction.bid_line</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_bids_form">
+        <field name="res_model">auction.bid_line</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
 
-	<menuitem name="Bids line" parent="menu_action_bid_open" action="action_bids_form" id="menu_action_bids_form"/>
+    <menuitem name="Bids line" parent="menu_action_bid_open" action="action_bids_form" id="menu_action_bids_form"/>
 
 
 <!--start : creating auction Reporting menu for the auction by pmo-->
 
 <record model="ir.ui.view" id="view_auction_reports_tree">
-		<field name="name">auction.reports.tree</field>
-		<field name="model">report.auction.view</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Auction results">
-				<field name="auction_id" />
-				<field name="nobjects" />
-				<field name="nbuyer" />
-				<field name="obj_ret" />
-				<field name="nseller" />
-				<field name="min_est" />
-				<field name="max_est" />
-				<field name="adj_price" />
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_auction_reports_form">
-		<field name="name">auction.reports.form</field>
-		<field name="model">report.auction.view</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Auctions results">
-				<field name="auction_id" />
-				<field name="nobjects" />
-				<field name="nbuyer" />
-				<field name="nseller" />
-				<field name="min_est" />
-				<field name="max_est" />
-				<field name="adj_price" />
-			</form>
-		</field>
-	</record>
+        <field name="name">auction.reports.tree</field>
+        <field name="model">report.auction.view</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Auction results">
+                <field name="auction_id" />
+                <field name="nobjects" />
+                <field name="nbuyer" />
+                <field name="obj_ret" />
+                <field name="nseller" />
+                <field name="min_est" />
+                <field name="max_est" />
+                <field name="adj_price" />
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_auction_reports_form">
+        <field name="name">auction.reports.form</field>
+        <field name="model">report.auction.view</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Auctions results">
+                <field name="auction_id" />
+                <field name="nobjects" />
+                <field name="nbuyer" />
+                <field name="nseller" />
+                <field name="min_est" />
+                <field name="max_est" />
+                <field name="adj_price" />
+            </form>
+        </field>
+    </record>
 
-	<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6"/>
+    <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6"/>
 
 
 <record model="ir.actions.act_window" id="action_auction_report_allmonth_view1">
-		<field name="name">Auction report</field>
-		<field name="res_model">report.auction.view</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<!--field name="domain">[('auction_id','=', active_id)]</field-->
-	</record>
-	<menuitem name="Auction" id="auction_report_auction_menu" parent="auction_report_menu"/>
+        <field name="name">Auction report</field>
+        <field name="res_model">report.auction.view</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <!--field name="domain">[('auction_id','=', active_id)]</field-->
+    </record>
+    <menuitem name="Auction" id="auction_report_auction_menu" parent="auction_report_menu"/>
    <menuitem name="Auction's Summary"  parent="auction_report_auction_menu" action="action_auction_report_allmonth_view1" id="menu_auction_allmonth_view1"/>
 
 
 
-	<!--start : auction reporting view 2-->
+    <!--start : auction reporting view 2-->
 
 <record model="ir.ui.view" id="view_auction_reports_tree2">
-		<field name="name">auction.reports.tree2</field>
-		<field name="model">report.auction.view2</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Auction Reporting tree view2">
-				<field name="date" />
-				<field name="auction" />
-				<field name="sum_adj" />
-				<field name="obj_number" />
-				<field name="gross_revenue" />
-				<field name="net_revenue" />
-				<field name="obj_margin" />
-				<field name="obj_margin_procent" />
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_auction_reports_form2">
-		<field name="name">Auction report</field>
-		<field name="model">report.auction.view2</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Auctions">
-				<field name="auction" />
-				<field name="sum_adj" />
-				<field name="gross_revenue" />
-				<field name="net_revenue" />
-				<field name="obj_margin" />
-				<field name="obj_margin_procent" />
-			</form>
-		</field>
-	</record>
+        <field name="name">auction.reports.tree2</field>
+        <field name="model">report.auction.view2</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Auction Reporting tree view2">
+                <field name="date" />
+                <field name="auction" />
+                <field name="sum_adj" />
+                <field name="obj_number" />
+                <field name="gross_revenue" />
+                <field name="net_revenue" />
+                <field name="obj_margin" />
+                <field name="obj_margin_procent" />
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_auction_reports_form2">
+        <field name="name">Auction report</field>
+        <field name="model">report.auction.view2</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Auctions">
+                <field name="auction" />
+                <field name="sum_adj" />
+                <field name="gross_revenue" />
+                <field name="net_revenue" />
+                <field name="obj_margin" />
+                <field name="obj_margin_procent" />
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_auction_report_thismonth_view2">
-		<field name="name">Auction report</field>
-		<field name="res_model">report.auction.view2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_auction_report_thismonth_view2">
+        <field name="name">Auction report</field>
+        <field name="res_model">report.auction.view2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+    </record>
 
-<!--	<menuitem name="This Month" id="auction_report_thismonth_menu" parent="auction_report_menu"/>   -->
-<!--	<menuitem name="Result of Auction" action="action_auction_report_thismonth_view2" id="menu_auction_thismonth_view2" parent="auction_report_thismonth_menu"/> -->
+<!--    <menuitem name="This Month" id="auction_report_thismonth_menu" parent="auction_report_menu"/>   -->
+<!--    <menuitem name="Result of Auction" action="action_auction_report_thismonth_view2" id="menu_auction_thismonth_view2" parent="auction_report_thismonth_menu"/> -->
 
 
 <record model="ir.actions.act_window" id="action_auction_report_allmonth_view2">
-		<field name="name">Auction report</field>
-		<field name="res_model">report.auction.view2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-	</record>
-	<menuitem name="Auction's Revenues" parent="auction_report_auction_menu" action="action_auction_report_allmonth_view2" id="menu_auction_allmonth_view2"/>
+        <field name="name">Auction report</field>
+        <field name="res_model">report.auction.view2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <menuitem name="Auction's Revenues" parent="auction_report_auction_menu" action="action_auction_report_allmonth_view2" id="menu_auction_allmonth_view2"/>
 
 <!--start : creating seller Reporting menu for the selller by pmo-->
 
 <record model="ir.ui.view" id="view_auction_form">
-		<field name="name">Seller's auction</field>
-		<field name="model">report.seller.auction</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Auction reporting form view">
-				<field name="seller" select="1"/>
-				<field name="total_price"/>
-				<field name="avg_price"/>
-				<field name="state" select="1"/>
-			</form>
-		</field>
-	</record>
+        <field name="name">Seller's auction</field>
+        <field name="model">report.seller.auction</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Auction reporting form view">
+                <field name="seller" select="1"/>
+                <field name="total_price"/>
+                <field name="avg_price"/>
+                <field name="state" select="1"/>
+            </form>
+        </field>
+    </record>
 
 
-	<record model="ir.ui.view" id="view_auction_tree">
-		<field name="name">Seller's auction</field>
-		<field name="model">report.seller.auction</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Auction reporting tree view">
-				<field name="auction" />
-				<!--field name="date" /-->
-				<field name="seller" select="1"/>
-				<field name="object_number" select="2"/>
-				<field name="total_price" select="2"/>
-				<field name="avg_price" select="2" />
-				<field name="avg_estimation" select="2" />
-			</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_auction_graph">
-		<field name="name">Seller's auction</field>
-		<field name="model">report.seller.auction</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Auction reporting graph view" orientation="vertical" type="bar">
-				<field name="seller" />
-			<!--	<field name="object_sold"/>	-->
-				<field name="total_price" operator="+"/>
-				<field name="avg_price" operator="+" />
-				<field name="avg_estimation" operator="+" />
+    <record model="ir.ui.view" id="view_auction_tree">
+        <field name="name">Seller's auction</field>
+        <field name="model">report.seller.auction</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Auction reporting tree view">
+                <field name="auction" />
+                <!--field name="date" /-->
+                <field name="seller" select="1"/>
+                <field name="object_number"/>
+                <field name="total_price"/>
+                <field name="avg_price" />
+                <field name="avg_estimation" />
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_auction_graph">
+        <field name="name">Seller's auction</field>
+        <field name="model">report.seller.auction</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Auction reporting graph view" orientation="vertical" type="bar">
+                <field name="seller" />
+            <!--    <field name="object_sold"/>    -->
+                <field name="total_price" operator="+"/>
+                <field name="avg_price" operator="+" />
+                <field name="avg_estimation" operator="+" />
 
-			</graph>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_auction_reporting1">
-		<field name="name">Seller's auction</field>
-		<field name="res_model">report.seller.auction</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,graph</field>
-		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_auction_reporting_all1">
-		<field name="name">Seller's auction</field>
-		<field name="res_model">report.seller.auction</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,graph</field>
-	</record>
-		<menuitem name="Sellers" id="auction_report_seller_menu" parent="auction_report_menu"/>
-	<menuitem name="Seller's Summary" action="action_auction_reporting_all1" id="menu_seller_allmonth_view1" parent="auction_report_seller_menu"/>
+            </graph>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_auction_reporting1">
+        <field name="name">Seller's auction</field>
+        <field name="res_model">report.seller.auction</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+    </record>
+    <record model="ir.actions.act_window" id="action_auction_reporting_all1">
+        <field name="name">Seller's auction</field>
+        <field name="res_model">report.seller.auction</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+    </record>
+        <menuitem name="Sellers" id="auction_report_seller_menu" parent="auction_report_menu"/>
+    <menuitem name="Seller's Summary" action="action_auction_reporting_all1" id="menu_seller_allmonth_view1" parent="auction_report_seller_menu"/>
 
 <record model="ir.ui.view" id="view_auction_form2">
-		<field name="name">Seller's auction</field>
-		<field name="model">report.seller.auction2</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Auction reporting2 form view">
-				<field name="auction" select="1"/>
-				<field name="seller" select="1"/>
-				<field name="sum_adj" select="1"/>
-				<field name="gross_revenue" select="1"/>
-				<field name="net_revenue" select="1"/>
-				<field name="net_margin" select="1" />
-				<field name="date" select="1"/>
+        <field name="name">Seller's auction</field>
+        <field name="model">report.seller.auction2</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Auction reporting2 form view">
+                <field name="auction" select="1"/>
+                <field name="seller" select="1"/>
+                <field name="sum_adj" select="1"/>
+                <field name="gross_revenue" select="1"/>
+                <field name="net_revenue" select="1"/>
+                <field name="net_margin" select="1" />
+                <field name="date" select="1"/>
 
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_auction_tree2">
-		<field name="name">Seller's auction</field>
-		<field name="model">report.seller.auction2</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Auction reporting2 tree view">
-				<field name="auction" select="1"/>
-				<field name="seller" select="1"/>
-				<field name="sum_adj" select="1" sum="Sum adj"/>
-				<field name="gross_revenue" select="1"/>
-				<field name="net_revenue" select="1"/>
-				<field name="net_margin" select="1" sum="Sum net margin"/>
-				<field name="date" select="1"/>
-				</tree>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_auction_graph2">
-		<field name="name">Seller's auction</field>
-		<field name="model">report.seller.auction2</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Auction seller reporting2 graph view" orientation="vertical" type="bar">
-				<field name="seller" />
-				<field name="net_revenue" operator="+"/>
-				<field name="gross_revenue" operator="+" />
-				<field name="net_margin" operator="+" />
-				</graph>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_auction_reporting_all2">
-		<field name="name">Seller's auction</field>
-		<field name="res_model">report.seller.auction2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,graph</field>
-		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
-	</record>
-	<menuitem name="Seller's Revenues" action="action_auction_reporting_all2" id="menu_seller_allmonth_view2" parent="auction_report_seller_menu"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_auction_tree2">
+        <field name="name">Seller's auction</field>
+        <field name="model">report.seller.auction2</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Auction reporting2 tree view">
+                <field name="auction" select="1"/>
+                <field name="seller" select="1"/>
+                <field name="sum_adj" select="1" sum="Sum adj"/>
+                <field name="gross_revenue" select="1"/>
+                <field name="net_revenue" select="1"/>
+                <field name="net_margin" select="1" sum="Sum net margin"/>
+                <field name="date" select="1"/>
+                </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_auction_graph2">
+        <field name="name">Seller's auction</field>
+        <field name="model">report.seller.auction2</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Auction seller reporting2 graph view" orientation="vertical" type="bar">
+                <field name="seller" />
+                <field name="net_revenue" operator="+"/>
+                <field name="gross_revenue" operator="+" />
+                <field name="net_margin" operator="+" />
+                </graph>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_auction_reporting_all2">
+        <field name="name">Seller's auction</field>
+        <field name="res_model">report.seller.auction2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+    </record>
+    <menuitem name="Seller's Revenues" action="action_auction_reporting_all2" id="menu_seller_allmonth_view2" parent="auction_report_seller_menu"/>
 
 <record model="ir.ui.view" id="view_auction_buyer_form">
-		<field name="name">Buyer's auction</field>
-		<field name="model">report.buyer.auction</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Auction buyer reporting form view">
-				<field name="buyer_login" select="1"/>
-				<field name="buyer" select="1"/>
-				<field name="object"/>
-				<field name="total_price"/>
-				<field name="avg_price"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_auction_buyer_tree">
-		<field name="name">Buyer's auction</field>
-		<field name="model">report.buyer.auction</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Auction buyer reporting tree view">
-				<field name="auction" select="1"/>
-				<field name="buyer_login" select="1"/>
-				<field name="buyer" select="1"/>
-				<field name="object" select="1"/>
-				<field name="total_price" select="1"/>
-				<field name="avg_price" select="1"/>
-			</tree>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_auction_buyer_reporting">
-		<field name="name">Buyer's auction</field>
-		<field name="res_model">report.buyer.auction</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
-	</record>
+        <field name="name">Buyer's auction</field>
+        <field name="model">report.buyer.auction</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Auction buyer reporting form view">
+                <field name="buyer_login" select="1"/>
+                <field name="buyer" select="1"/>
+                <field name="object"/>
+                <field name="total_price"/>
+                <field name="avg_price"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_auction_buyer_tree">
+        <field name="name">Buyer's auction</field>
+        <field name="model">report.buyer.auction</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Auction buyer reporting tree view">
+                <field name="auction" select="1"/>
+                <field name="buyer_login" select="1"/>
+                <field name="buyer" select="1"/>
+                <field name="object" select="1"/>
+                <field name="total_price" select="1"/>
+                <field name="avg_price" select="1"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_auction_buyer_reporting">
+        <field name="name">Buyer's auction</field>
+        <field name="res_model">report.buyer.auction</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+    </record>
 
 <record model="ir.ui.view" id="view_auction_buyer_form2">
-		<field name="name">Buyer's auction</field>
-		<field name="model">report.buyer.auction2</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Auction buyer reporting form view2">
-				<field name="buyer_login" select="1"/>
-				<field name="buyer" select="1"/>
-				<field name="sumadj" />
-				<field name="gross_revenue" />
-				<field name="net_revenue" />
-				<field name="net_margin" />
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_auction_buyer_tree2">
-		<field name="name">Buyer's auction</field>
-		<field name="model">report.buyer.auction2</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Auction buyer reporting tree view2">
-					<field name="auction" select="1"/>
-					<field name="buyer_login" select="1"/>
-					<field name="buyer" select="1"/>
-					<field name="sumadj" select="1" sum="Sum adj"/>
-					<field name="gross_revenue" select="1"/>
-					<field name="net_revenue" select="1"/>
-					<field name="net_margin" select="1" sum="Sum net margin"/>
-		</tree>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_auction_buyer_reporting2">
-		<field name="name">Buyer's auction</field>
-		<field name="res_model">report.buyer.auction2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
-	</record>
+        <field name="name">Buyer's auction</field>
+        <field name="model">report.buyer.auction2</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Auction buyer reporting form view2">
+                <field name="buyer_login" select="1"/>
+                <field name="buyer" select="1"/>
+                <field name="sumadj" />
+                <field name="gross_revenue" />
+                <field name="net_revenue" />
+                <field name="net_margin" />
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_auction_buyer_tree2">
+        <field name="name">Buyer's auction</field>
+        <field name="model">report.buyer.auction2</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Auction buyer reporting tree view2">
+                    <field name="auction" select="1"/>
+                    <field name="buyer_login" select="1"/>
+                    <field name="buyer" select="1"/>
+                    <field name="sumadj" select="1" sum="Sum adj"/>
+                    <field name="gross_revenue" select="1"/>
+                    <field name="net_revenue" select="1"/>
+                    <field name="net_margin" select="1" sum="Sum net margin"/>
+        </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_auction_buyer_reporting2">
+        <field name="name">Buyer's auction</field>
+        <field name="res_model">report.buyer.auction2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_auction_buyer_reporting_all1">
-		<field name="name">Buyer's auction</field>
-		<field name="res_model">report.buyer.auction</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-	</record>
-	<menuitem name="Buyer" id="auction_report_buyer_menu" parent="auction_report_menu"/>
-	<menuitem name="Buyer's Summary" action="action_auction_buyer_reporting_all1" id="menu_buyer_allmonth_view1" parent="auction_report_buyer_menu"/>
+    <record model="ir.actions.act_window" id="action_auction_buyer_reporting_all1">
+        <field name="name">Buyer's auction</field>
+        <field name="res_model">report.buyer.auction</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <menuitem name="Buyer" id="auction_report_buyer_menu" parent="auction_report_menu"/>
+    <menuitem name="Buyer's Summary" action="action_auction_buyer_reporting_all1" id="menu_buyer_allmonth_view1" parent="auction_report_buyer_menu"/>
 
-	<record model="ir.actions.act_window" id="action_auction_buyer_reporting_all2">
-		<field name="name">Buyer's auction for all months</field>
-		<field name="res_model">report.buyer.auction2</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_auction_buyer_reporting_all2">
+        <field name="name">Buyer's auction for all months</field>
+        <field name="res_model">report.buyer.auction2</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+    </record>
 
 
 
@@ -1014,107 +1014,107 @@
 
 <!--end : creating buyer Reporting menu for the buyer by pmo-->
 
-		<record model="ir.ui.view" id="view_report_unplanned_object_tree">
-		<field name="name">Unplanned objects</field>
-		<field name="model">report.unplanned.object</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Unplanned Objects">
-				<field name="depos" select="1"/>
-				<field name="lot" select="1"/>
-				<field name="product_l" select="1"/>
-				<field name="lot_est1_l" select="2"/>
-				<field name="lot_est2_l" select="1"/>
-				<field name="artist_id_l" select="1"/>
-				<field name="name_l" select="1"/>
-				<field name="obj_desc_l" select="2"/>
-			</tree>
-		</field>
-	</record>
-		<record model="ir.ui.view" id="view_report_unplanned_object_form">
-			<field name="name">Unplanned objects</field>
-			<field name="model">report.unplanned.object</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-			<form string="Unplanned Objects">
-				<field name="depos" select="1"/>
-				<field name="lot" select="1"/>
-				<field name="product_l" select="1"/>
-				<field name="lot_est1_l" select="1"/>
-				<field name="lot_est2_l" select="1"/>
-				<field name="artist_id_l" select="1"/>
-				<field name="obj_desc_l" select="1"/>
-				<field name="name_l" select="1"/>
-			</form>
-		</field>
-	</record>
+        <record model="ir.ui.view" id="view_report_unplanned_object_tree">
+        <field name="name">Unplanned objects</field>
+        <field name="model">report.unplanned.object</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Unplanned Objects">
+                <field name="depos" select="1"/>
+                <field name="lot" select="1"/>
+                <field name="product_l" select="1"/>
+                <field name="lot_est1_l"/>
+                <field name="lot_est2_l" select="1"/>
+                <field name="artist_id_l" select="1"/>
+                <field name="name_l" select="1"/>
+                <field name="obj_desc_l"/>
+            </tree>
+        </field>
+    </record>
+        <record model="ir.ui.view" id="view_report_unplanned_object_form">
+            <field name="name">Unplanned objects</field>
+            <field name="model">report.unplanned.object</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Unplanned Objects">
+                <field name="depos" select="1"/>
+                <field name="lot" select="1"/>
+                <field name="product_l" select="1"/>
+                <field name="lot_est1_l" select="1"/>
+                <field name="lot_est2_l" select="1"/>
+                <field name="artist_id_l" select="1"/>
+                <field name="obj_desc_l" select="1"/>
+                <field name="name_l" select="1"/>
+            </form>
+        </field>
+    </record>
 
 =============================
 estimation.adj.category
 ==============================
-	<record model="ir.ui.view" id="view_report_auction_estimation_adj_category_form">
-		<field name="name">report.auction.estimation.adj.category.form</field>
-		<field name="model">report.auction.estimation.adj.category</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Min est/Adj/Max est">
-				<!--field name="date" select="1"/-->
-				<field name="lot_type" select="1"/>
-				<field name="user_id" select="1"/>
-				<field name="lot_est1" select="2"/>
-				<field name="lot_est2" select="2"/>
-				<field name="adj_total" select="2"/>
-				<field name="date" select="1"/>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_report_auction_estimation_adj_category_tree">
-		<field name="name">report.auction.estimation.adj.category.tree</field>
-		<field name="model">report.auction.estimation.adj.category</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Min est/Adj/Max est">
-				<!--field name="date" select="1"/-->
-				<field name="user_id" select="1"/>
-				<field name="lot_type" select="1"/>
-				<field name="lot_est1" select="1"/>
-				<field name="lot_est2" select="1"/>
-				<field name="adj_total" select="1"/>
-				<field name="date" select="1"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_report_auction_estimation_adj_category_form">
+        <field name="name">report.auction.estimation.adj.category.form</field>
+        <field name="model">report.auction.estimation.adj.category</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Min est/Adj/Max est">
+                <!--field name="date" select="1"/-->
+                <field name="lot_type" select="1"/>
+                <field name="user_id" select="1"/>
+                <field name="lot_est1"/>
+                <field name="lot_est2"/>
+                <field name="adj_total"/>
+                <field name="date" select="1"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_report_auction_estimation_adj_category_tree">
+        <field name="name">report.auction.estimation.adj.category.tree</field>
+        <field name="model">report.auction.estimation.adj.category</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Min est/Adj/Max est">
+                <!--field name="date" select="1"/-->
+                <field name="user_id" select="1"/>
+                <field name="lot_type" select="1"/>
+                <field name="lot_est1" select="1"/>
+                <field name="lot_est2" select="1"/>
+                <field name="adj_total" select="1"/>
+                <field name="date" select="1"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_report_auction_estimation_adj_category_graph">
-		<field name="name">report.auction.estimation.adj.category.graph</field>
-		<field name="model">report.auction.estimation.adj.category</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Min est/Adj/Max est" orientation="vertical" type="bar">
-				<!--field name="date" operator="+"/-->
-				<field name="lot_type" select="1"/>
-				<field name="lot_est1" operator="+"/>
-				<field name="adj_total" operator="+"/>
-				<field name="lot_est2" operator="+"/>
-				<field name="user_id" group="True"/>
-			</graph>
-		</field>
-	</record>
-		<record model="ir.actions.act_window" id="action_report_auction_estimation_adj_category_manager_tree">
-		<field name="name">Min est/Adj/Max est</field>
-		<field name="res_model">report.auction.estimation.adj.category</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain">[('date','like',time.strftime('%Y-%m'))]</field>
-	</record>
+    <record model="ir.ui.view" id="view_report_auction_estimation_adj_category_graph">
+        <field name="name">report.auction.estimation.adj.category.graph</field>
+        <field name="model">report.auction.estimation.adj.category</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Min est/Adj/Max est" orientation="vertical" type="bar">
+                <!--field name="date" operator="+"/-->
+                <field name="lot_type" select="1"/>
+                <field name="lot_est1" operator="+"/>
+                <field name="adj_total" operator="+"/>
+                <field name="lot_est2" operator="+"/>
+                <field name="user_id" group="True"/>
+            </graph>
+        </field>
+    </record>
+        <record model="ir.actions.act_window" id="action_report_auction_estimation_adj_category_manager_tree">
+        <field name="name">Min est/Adj/Max est</field>
+        <field name="res_model">report.auction.estimation.adj.category</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain">[('date','like',time.strftime('%Y-%m'))]</field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_auction_estimation_adj_category_member_tree">
-		<field name="name">Min est/Adj/Max est</field>
-		<field name="res_model">report.auction.estimation.adj.category</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain">[('date','like',time.strftime('%Y-%m')),('user_id','=',uid)]</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_report_auction_estimation_adj_category_member_tree">
+        <field name="name">Min est/Adj/Max est</field>
+        <field name="res_model">report.auction.estimation.adj.category</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain">[('date','like',time.strftime('%Y-%m')),('user_id','=',uid)]</field>
+    </record>
 
 <menuitem name="Employees" id="auction_report_employees_menu" parent="auction_report_menu"/>
 <menuitem name="Comparison of estimations" action="action_report_auction_estimation_adj_category_member_tree" id="menu_report_auction_estimation_adj_category_member" parent="auction_report_employees_menu"/>
@@ -1126,325 +1126,325 @@ estimation.adj.category
 sign in sign out report by user
 ==============================
 
-	<record model="ir.ui.view" id="view_report_auction_sign_in_out_tree">
-		<field name="name">report.auction.user.pointing.tree</field>
-		<field name="model">report.auction.user.pointing</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Summary pointing by user ">
-				<field name="user_id" select="1"/>
-				<field name="total_timesheet" widget="float_time"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_report_auction_sign_in_out_tree">
+        <field name="name">report.auction.user.pointing.tree</field>
+        <field name="model">report.auction.user.pointing</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Summary pointing by user ">
+                <field name="user_id" select="1"/>
+                <field name="total_timesheet" widget="float_time"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_report_auction_sign_in_out_graph">
-		<field name="name">report.auction.user.pointing.graph</field>
-		<field name="model">report.auction.user.pointing</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
+    <record model="ir.ui.view" id="view_report_auction_sign_in_out_graph">
+        <field name="name">report.auction.user.pointing.graph</field>
+        <field name="model">report.auction.user.pointing</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
 
-			<graph string="Summary pointing by user " orientation="vertical" type="bar">
-				<field name="user_id" select="1"/>
-				<field name="total_timesheet" />
-			</graph>
-		</field>
-	</record>
+            <graph string="Summary pointing by user " orientation="vertical" type="bar">
+                <field name="user_id" select="1"/>
+                <field name="total_timesheet" />
+            </graph>
+        </field>
+    </record>
 
 
-	<record model="ir.actions.act_window" id="action_report_auction_sign_in_out_member_tree">
-		<field name="res_model">report.auction.user.pointing</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,graph</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_report_auction_sign_in_out_manager_tree">
-		<field name="res_model">report.auction.user.pointing</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,graph</field>
-	</record>
-	<menuitem name="Summury of Sign_in Sign_out" action="action_report_auction_sign_in_out_member_tree" id="menu_report_auction_sign_in_out_member_tree" parent="auction_report_manager_menu"/>
-	<menuitem name="Summury of Sign_in Sign_out"  action="action_report_auction_sign_in_out_manager_tree" id="menu_report_auction_sign_in_out_manager_tree" parent="auction_report_manager_menu"/>
+    <record model="ir.actions.act_window" id="action_report_auction_sign_in_out_member_tree">
+        <field name="res_model">report.auction.user.pointing</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+    </record>
+    <record model="ir.actions.act_window" id="action_report_auction_sign_in_out_manager_tree">
+        <field name="res_model">report.auction.user.pointing</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+    </record>
+    <menuitem name="Summury of Sign_in Sign_out" action="action_report_auction_sign_in_out_member_tree" id="menu_report_auction_sign_in_out_member_tree" parent="auction_report_manager_menu"/>
+    <menuitem name="Summury of Sign_in Sign_out"  action="action_report_auction_sign_in_out_manager_tree" id="menu_report_auction_sign_in_out_manager_tree" parent="auction_report_manager_menu"/>
 
 -->
-	<record model="ir.ui.view" id="view_report_auction_sign_in_out_tree1">
-		<field name="name">report attendance</field>
-		<field name="model">report.attendance</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="User's pointing">
-				<field name="employee_id" select="1"/>
-				<field name="name" select="1"/>
-				<field name="total_attendance" select="1"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_report_auction_sign_in_out_tree1">
+        <field name="name">report attendance</field>
+        <field name="model">report.attendance</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="User's pointing">
+                <field name="employee_id" select="1"/>
+                <field name="name" select="1"/>
+                <field name="total_attendance" select="1"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_report_auction_sign_in_out_graph1">
-		<field name="name">Graph attendance</field>
-		<field name="model">report.attendance</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="User's pointing"  orientation="vertical" type="bar">
-				<field name="employee_id" select="1"/>
-				<field name="total_attendance" operator="+"/>
-				<field name="name" select="1"/>
-		</graph>
+    <record model="ir.ui.view" id="view_report_auction_sign_in_out_graph1">
+        <field name="name">Graph attendance</field>
+        <field name="model">report.attendance</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="User's pointing"  orientation="vertical" type="bar">
+                <field name="employee_id" select="1"/>
+                <field name="total_attendance" operator="+"/>
+                <field name="name" select="1"/>
+        </graph>
 
-		</field>
-	</record>
+        </field>
+    </record>
 
 
-	<record model="ir.actions.act_window" id="action_report_auction_sign_in_out_member_tree1">
-		<field name="res_model">report.attendance</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,graph</field>
-		<field name="domain"> [('name','=',time.strftime('%Y-%m-%d')),('employee_id','=',uid)]</field>
-		<!--<field name="domain"> [('name','ilike',time.strftime('%Y-%m'))]</field>-->
-	</record>
-	<menuitem name="Attendance" action="action_report_auction_sign_in_out_member_tree1" id="menu_report_auction_sign_in_out_member_tree1" parent="auction_report_employees_menu"/>
+    <record model="ir.actions.act_window" id="action_report_auction_sign_in_out_member_tree1">
+        <field name="res_model">report.attendance</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="domain"> [('name','=',time.strftime('%Y-%m-%d')),('employee_id','=',uid)]</field>
+        <!--<field name="domain"> [('name','ilike',time.strftime('%Y-%m'))]</field>-->
+    </record>
+    <menuitem name="Attendance" action="action_report_auction_sign_in_out_member_tree1" id="menu_report_auction_sign_in_out_member_tree1" parent="auction_report_employees_menu"/>
 
 
-	<record model="ir.actions.act_window" id="action_report_auction_sign_in_out_manager_tree1">
-		<field name="res_model">report.attendance</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,graph</field>
-		<field name="domain"> [('name','=',time.strftime('%Y-%m-%d'))]</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_report_auction_sign_in_out_manager_tree1">
+        <field name="res_model">report.attendance</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="domain"> [('name','=',time.strftime('%Y-%m-%d'))]</field>
+    </record>
 
-	<menuitem name="Attendance"  action="action_report_auction_sign_in_out_manager_tree1" id="menu_report_auction_sign_in_out_manager_tree1" parent="auction_report_manager_menu"/>
+    <menuitem name="Attendance"  action="action_report_auction_sign_in_out_manager_tree1" id="menu_report_auction_sign_in_out_manager_tree1" parent="auction_report_manager_menu"/>
 
 ==============================
 My Latest Objects
 ==============================
-	<record model="ir.actions.act_window" id="action_report_latest_objects_tree">
-		<field name="res_model">auction.lots</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('create_uid','=',uid)]</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_report_latest_objects_tree">
+        <field name="res_model">auction.lots</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('create_uid','=',uid)]</field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_latest_objects_manager_tree">
-		<field name="res_model">auction.lots</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="limit" eval="80"/>
-	</record>
+    <record model="ir.actions.act_window" id="action_report_latest_objects_manager_tree">
+        <field name="res_model">auction.lots</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="limit" eval="80"/>
+    </record>
 
 
 =============================
 My Latest Deposit
 ==============================
 
-	<record model="ir.actions.act_window" id="action_report_latest_doposit_manager_tree">
-		<field name="res_model">auction.deposit</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_report_latest_doposit_manager_tree">
+        <field name="res_model">auction.deposit</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
 
-	<menuitem name="Latest Deposits" action="action_report_latest_doposit_manager_tree" id="menu_report_latest_doposit_tree_manager" parent="auction_report_manager_menu"/>
+    <menuitem name="Latest Deposits" action="action_report_latest_doposit_manager_tree" id="menu_report_latest_doposit_tree_manager" parent="auction_report_manager_menu"/>
 =============================
 Objects per Day
 ==============================
-	<record model="ir.ui.view" id="view_report_auction_object_date_tree">
-	   <field name="name">Objects by date</field>
-	   <field name="model">report.auction.object.date</field>
-		<field name="type">tree</field>
-			<field name="arch" type="xml">
-			<tree string="Objects per Day">
-				<field name="month" select="1" />
-				<field name="user_id" select="1"/>
-				<field name="obj_num"/>
-				<field name="name" />
-			</tree>
-		</field>
-	 </record>
+    <record model="ir.ui.view" id="view_report_auction_object_date_tree">
+       <field name="name">Objects by date</field>
+       <field name="model">report.auction.object.date</field>
+        <field name="type">tree</field>
+            <field name="arch" type="xml">
+            <tree string="Objects per Day">
+                <field name="month" select="1" />
+                <field name="user_id" select="1"/>
+                <field name="obj_num"/>
+                <field name="name" />
+            </tree>
+        </field>
+     </record>
 
-	 <record model="ir.ui.view" id="view_report_auction_object_date_form">
-		<field name="name">Object date</field>
-		<field name="model">report.auction.object.date</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Objects per Day">
-				<field name="user_id" />
-				<field name="name" select="1"/>
-				<field name="obj_num" />
-				<field name="month" select="1"/>
-			 </form>
-		 </field>
-	 </record>
+     <record model="ir.ui.view" id="view_report_auction_object_date_form">
+        <field name="name">Object date</field>
+        <field name="model">report.auction.object.date</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Objects per Day">
+                <field name="user_id" />
+                <field name="name" select="1"/>
+                <field name="obj_num" />
+                <field name="month" select="1"/>
+             </form>
+         </field>
+     </record>
 
-	<record model="ir.ui.view" id="view_report_auction_object_date_graph">
-		<field name="name">report.auction.object.date.graph</field>
-		<field name="model">report.auction.object.date</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Objects per day"  type="bar">
-				<field name="name" select="1"/>
-				<field name="obj_num" operator="+"/>
-				<field name="user_id" group="True"/>
-			</graph>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_report_auction_object_date_graph">
+        <field name="name">report.auction.object.date.graph</field>
+        <field name="model">report.auction.object.date</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Objects per day"  type="bar">
+                <field name="name" select="1"/>
+                <field name="obj_num" operator="+"/>
+                <field name="user_id" group="True"/>
+            </graph>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_auction_object_date_tree">
-		<field name="res_model">report.auction.object.date</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-		<field name="domain">[('month','=',time.strftime('%Y-%m-01'))]</field>
-	</record>
-	<menuitem
-		name="Encoded Objects Per Day"
-		action="action_report_auction_object_date_tree"
-		id="menu_report_auction_object_date_tree"
-		parent="auction_report_manager_menu"/>
+    <record model="ir.actions.act_window" id="action_report_auction_object_date_tree">
+        <field name="res_model">report.auction.object.date</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+        <field name="domain">[('month','=',time.strftime('%Y-%m-01'))]</field>
+    </record>
+    <menuitem
+        name="Encoded Objects Per Day"
+        action="action_report_auction_object_date_tree"
+        id="menu_report_auction_object_date_tree"
+        parent="auction_report_manager_menu"/>
 
-	<record model="ir.actions.act_window" id="view_report_object_by_auction">
-		<field name="name">Detailed lots</field>
-		<field name="res_model">auction.lots</field>
-		<field name="view_type">form</field>
-		<field name="domain">[('auction_id','=', active_id)]</field>
-		<field name="limit" eval="2000"/>
-	</record>
-	<record model="ir.values" id="ir_open_auction_lots">
-		<field name="key2">tree_but_open</field>
-		<field name="model">auction.dates</field>
-		<field name="name">Open auction</field>
-		<field name="value" eval="'ir.actions.act_window,%d'%view_report_object_by_auction"/>
-		<field name="object" eval="True"/>
-	</record>
+    <record model="ir.actions.act_window" id="view_report_object_by_auction">
+        <field name="name">Detailed lots</field>
+        <field name="res_model">auction.lots</field>
+        <field name="view_type">form</field>
+        <field name="domain">[('auction_id','=', active_id)]</field>
+        <field name="limit" eval="2000"/>
+    </record>
+    <record model="ir.values" id="ir_open_auction_lots">
+        <field name="key2">tree_but_open</field>
+        <field name="model">auction.dates</field>
+        <field name="name">Open auction</field>
+        <field name="value" eval="'ir.actions.act_window,%d'%view_report_object_by_auction"/>
+        <field name="object" eval="True"/>
+    </record>
 
-	<record model="ir.actions.act_window" id="auction_lots_open">
-		<field name="name">Simplified lots for adjudication</field>
-		<field name="res_model">auction.lots</field>
-		<field name="view_type">form</field>
-		<field name="domain">[('auction_id','=',active_id)]</field>
-		<field name="limit" eval="2000"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_auction_lots_open_view1">
-		<field name="sequence" eval="1"/>
-		<field name="view_mode">tree</field>
-		<field name="act_window_id" ref="auction_lots_open"/>
-	</record>
-	<record model="ir.actions.act_window.view" id="action_auction_lots_open_view2">
-		<field name="sequence" eval="2"/>
-		<field name="view_mode">form</field>
-		<field name="act_window_id" ref="auction_lots_open"/>
-		<field name="view_id" ref="auction_lots_sell_form"/>
-	</record>
+    <record model="ir.actions.act_window" id="auction_lots_open">
+        <field name="name">Simplified lots for adjudication</field>
+        <field name="res_model">auction.lots</field>
+        <field name="view_type">form</field>
+        <field name="domain">[('auction_id','=',active_id)]</field>
+        <field name="limit" eval="2000"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_auction_lots_open_view1">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="act_window_id" ref="auction_lots_open"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_auction_lots_open_view2">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">form</field>
+        <field name="act_window_id" ref="auction_lots_open"/>
+        <field name="view_id" ref="auction_lots_sell_form"/>
+    </record>
 
-	<record model="ir.values" id="ir_open_auction_lots_adj">
-		<field name="key2">tree_but_action</field>
-		<field name="model">auction.dates</field>
-		<field name="name">Open lots for adjudication</field>
-		<field name="value" eval="'ir.actions.act_window,%d'%auction_lots_open"/>
-		<field name="object" eval="True"/>
-	</record>
+    <record model="ir.values" id="ir_open_auction_lots_adj">
+        <field name="key2">tree_but_action</field>
+        <field name="model">auction.dates</field>
+        <field name="name">Open lots for adjudication</field>
+        <field name="value" eval="'ir.actions.act_window,%d'%auction_lots_open"/>
+        <field name="object" eval="True"/>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_object_by_auction">
-		<field name="name">Auction dates</field>
-		<field name="res_model">auction.dates</field>
-		<field name="view_type">tree</field>
-		<field name="domain">[('state','=', 'draft')]</field>
-	</record>
-	<menuitem name="Objects by Auction"
-		parent="auction_objects_menu"
-		id="menu_auction_dates_next_by_auction"
-		action="action_report_object_by_auction" sequence="11"/>
+    <record model="ir.actions.act_window" id="action_report_object_by_auction">
+        <field name="name">Auction dates</field>
+        <field name="res_model">auction.dates</field>
+        <field name="view_type">tree</field>
+        <field name="domain">[('state','=', 'draft')]</field>
+    </record>
+    <menuitem name="Objects by Auction"
+        parent="auction_objects_menu"
+        id="menu_auction_dates_next_by_auction"
+        action="action_report_object_by_auction" sequence="11"/>
 
-	<act_window name="Open lots"
-		domain="[('auction_id', '=', active_id)]"
-		res_model="auction.lots"
-		src_model="auction.dates"
-		id="act_auction_lot_line_open"/>
+    <act_window name="Open lots"
+        domain="[('auction_id', '=', active_id)]"
+        res_model="auction.lots"
+        src_model="auction.dates"
+        id="act_auction_lot_line_open"/>
 
 =============================
 Auction adjudication
 ==============================
 
-	<record model="ir.ui.view" id="view_report_auction_adjudication_tree">
-		<field name="name">report.auction.adjudication.tree</field>
-		<field name="model">report.auction.adjudication</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Total adjudication">
-				<field name="name" select="1"/>
-				<field name="adj_total" select="1"/>
-				<field name="state" select="1"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_report_auction_adjudication_tree">
+        <field name="name">report.auction.adjudication.tree</field>
+        <field name="model">report.auction.adjudication</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Total adjudication">
+                <field name="name" select="1"/>
+                <field name="adj_total" select="1"/>
+                <field name="state" select="1"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_report_auction_adjudication_graph">
-		<field name="name">report.auction.adjudication.graph</field>
-		<field name="model">report.auction.adjudication</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Total adjudication" type="bar">
-				<field name="name" select="1"/>
-				<field name="adj_total" select="1" />
-				<field name="user_id" group="True"/>
+    <record model="ir.ui.view" id="view_report_auction_adjudication_graph">
+        <field name="name">report.auction.adjudication.graph</field>
+        <field name="model">report.auction.adjudication</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Total adjudication" type="bar">
+                <field name="name" select="1"/>
+                <field name="adj_total" select="1" />
+                <field name="user_id" group="True"/>
 
-			</graph>
-		</field>
+            </graph>
+        </field>
 
-	</record>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_auction_adjudication_tree">
-		<field name="res_model">report.auction.adjudication</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">graph,tree</field>
-	</record>
-	<menuitem name="Adjudication by Auction" action="action_report_auction_adjudication_tree" id="menu_report_auction_adjudication_tree" parent="auction_report_manager_menu"/>
+    <record model="ir.actions.act_window" id="action_report_auction_adjudication_tree">
+        <field name="res_model">report.auction.adjudication</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree</field>
+    </record>
+    <menuitem name="Adjudication by Auction" action="action_report_auction_adjudication_tree" id="menu_report_auction_adjudication_tree" parent="auction_report_manager_menu"/>
 
 
-	<record model="ir.ui.view" id="view_auction_deposit_tree">
-		<field name="name">Depositer's statistics</field>
-		<field name="model">report.deposit.border</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Depositer's statistics">
-				<field name="bord" select="1"/>
-				<field name="seller" select="1"/>
-				<field name="moy_est" select="1"/>
-				<field name="total_marge" select="1"/>
-				<field name="nb_obj" select="1"/>
-				</tree>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="menu_view_auction_deposit_tree">
-		<field name="res_model">report.deposit.border</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-	</record>
-	<menuitem name="Depositer's Statistics" action="menu_view_auction_deposit_tree" id="menu_report_deposit_tree_m" parent="auction_report_manager_menu"/>
-	<menuitem name="Depositer's Statistics" action="menu_view_auction_deposit_tree" id="menu_report_deposit_tree_member" parent="auction_report_employees_menu"/>
+    <record model="ir.ui.view" id="view_auction_deposit_tree">
+        <field name="name">Depositer's statistics</field>
+        <field name="model">report.deposit.border</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Depositer's statistics">
+                <field name="bord" select="1"/>
+                <field name="seller" select="1"/>
+                <field name="moy_est" select="1"/>
+                <field name="total_marge" select="1"/>
+                <field name="nb_obj" select="1"/>
+                </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="menu_view_auction_deposit_tree">
+        <field name="res_model">report.deposit.border</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <menuitem name="Depositer's Statistics" action="menu_view_auction_deposit_tree" id="menu_report_deposit_tree_m" parent="auction_report_manager_menu"/>
+    <menuitem name="Depositer's Statistics" action="menu_view_auction_deposit_tree" id="menu_report_deposit_tree_member" parent="auction_report_employees_menu"/>
 =============================
 Object encoded
 ==============================
-	<record model="ir.ui.view" id="view_report_object_encoded_form">
-		<field name="name">report.object.encoded.form</field>
-		<field name="model">report.object.encoded</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Objects statistics">
-				<field name="date" select="1"/>
-				<field name="state" select="1"/>
-				<field name="user_id" select="1"/>
-				<field name="estimation" select="2"/>
-				<field name="obj_ret" select="2"/>
-				<field name="obj_num" select="2" sum="# objects"/>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_report_object_encoded_form">
+        <field name="name">report.object.encoded.form</field>
+        <field name="model">report.object.encoded</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Objects statistics">
+                <field name="date" select="1"/>
+                <field name="state" select="1"/>
+                <field name="user_id" select="1"/>
+                <field name="estimation"/>
+                <field name="obj_ret"/>
+                <field name="obj_num" sum="# objects"/>
+            </form>
+        </field>
+    </record>
 
 <record model="ir.ui.view" id="view_report_object_encoded_tree">
 <field name="name">report.object.encoded.tree</field>
 <field name="model">report.object.encoded</field>
 <field name="type">tree</field>
 
-	<field name="arch" type="xml">
+    <field name="arch" type="xml">
 
-	<tree string="Objects statistics">
+    <tree string="Objects statistics">
 <field name="date" select="1"/>
 <field name="state" select="1"/>
 <field name="user_id" select="1"/>
@@ -1454,114 +1454,114 @@ Object encoded
 </tree>
 </field>
 </record>
-<!--	<record model="ir.ui.view" id="view_report_object_encoded_tree">
-		<field name="name">report.object.encoded.tree</field>
-		<field name="model">report.object.encoded</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Objects statistics" >
-				<field name="date" select="1"/>
-				<field name="state" select="1"/>
-				<field name="user_id" select="1"/>
-				<field name="estimation" />
-				<field name="obj_ret" />
-				<field name="obj_num" />
-			</tree>
-		</field>
-	</record>
+<!--    <record model="ir.ui.view" id="view_report_object_encoded_tree">
+        <field name="name">report.object.encoded.tree</field>
+        <field name="model">report.object.encoded</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Objects statistics" >
+                <field name="date" select="1"/>
+                <field name="state" select="1"/>
+                <field name="user_id" select="1"/>
+                <field name="estimation" />
+                <field name="obj_ret" />
+                <field name="obj_num" />
+            </tree>
+        </field>
+    </record>
 -->
-	<record model="ir.ui.view" id="view_report_object_encoded_graph">
-		<field name="name">report.object.encoded.graph</field>
-		<field name="model">report.object.encoded</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Objects statistics" type="bar">
-				<field name="user_id" select="1"/>
-				<field name="estimation" operator="+" />
-				<field name="obj_ret"  operator="+" />
-				<field name="obj_num"  operator="+" />
-			</graph>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_report_object_encoded_graph">
+        <field name="name">report.object.encoded.graph</field>
+        <field name="model">report.object.encoded</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Objects statistics" type="bar">
+                <field name="user_id" select="1"/>
+                <field name="estimation" operator="+" />
+                <field name="obj_ret"  operator="+" />
+                <field name="obj_num"  operator="+" />
+            </graph>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_object_encoded_member_tree">
-		<field name="res_model">report.object.encoded</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain"> [('user_id','=',uid),('date','ilike',time.strftime('%Y-%m'))]</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_report_object_encoded_member_tree">
+        <field name="res_model">report.object.encoded</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain"> [('user_id','=',uid),('date','ilike',time.strftime('%Y-%m'))]</field>
+    </record>
 
 
-	<record model="ir.ui.view" id="view_report_object_encoded_manager_tree">
-		<field name="name">report.object.encoded.tree</field>
-		<field name="model">report.object.encoded.manager</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Objects statistics">
-				<field name="user_id" select="1"/>
-				<field name="estimation" />
-				<field name="obj_ret" />
-				<field name="obj_num" sum="# objects" select="1"/>
-				<field name="adj" sum="Total adj."/>
-				<field name="obj_margin" />
-				<field name="net_revenue"  sum="Total net rev."/>
-				<field name="gross_revenue"  sum="Total gross rev."/>
-				<field name="date" select="1"/>
+    <record model="ir.ui.view" id="view_report_object_encoded_manager_tree">
+        <field name="name">report.object.encoded.tree</field>
+        <field name="model">report.object.encoded.manager</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Objects statistics">
+                <field name="user_id" select="1"/>
+                <field name="estimation" />
+                <field name="obj_ret" />
+                <field name="obj_num" sum="# objects" select="1"/>
+                <field name="adj" sum="Total adj."/>
+                <field name="obj_margin" />
+                <field name="net_revenue"  sum="Total net rev."/>
+                <field name="gross_revenue"  sum="Total gross rev."/>
+                <field name="date" select="1"/>
 
-			</tree>
-		</field>
-	</record>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_report_object_encoded_manager_graph">
-		<field name="name">report.object.encoded.graph</field>
-		<field name="model">report.object.encoded.manager</field>
-		<field name="type">graph</field>
-		<field name="arch" type="xml">
-			<graph string="Object statistic" type="bar">
-				<field name="user_id" select="1"/>
-				<field name="obj_ret"  operator="+" />
-				<field name="obj_num"  operator="+" />
-				<field name="obj_margin"  operator="+" />
-				<field name="net_revenue" operator="+" />
-				<field name="gross_revenue" operator="+" />
-			</graph>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_report_object_encoded_manager_graph">
+        <field name="name">report.object.encoded.graph</field>
+        <field name="model">report.object.encoded.manager</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Object statistic" type="bar">
+                <field name="user_id" select="1"/>
+                <field name="obj_ret"  operator="+" />
+                <field name="obj_num"  operator="+" />
+                <field name="obj_margin"  operator="+" />
+                <field name="net_revenue" operator="+" />
+                <field name="gross_revenue" operator="+" />
+            </graph>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_report_object_encoded_manager_tree">
-		<field name="res_model">report.object.encoded.manager</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
-		<field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_report_object_encoded_manager_tree">
+        <field name="res_model">report.object.encoded.manager</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[('date','ilike',time.strftime('%Y-%m'))]</field>
+    </record>
 
-	<record model="ir.ui.view" id="view_report_unclassified_objects">
-		<field name="name">report.unclassified.objects</field>
-		<field name="model">report.unclassified.objects</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Unclassified objects">
-				<field name="obj_num" string="Ref" select="1"/>
-				<field name="name" select="1"/>
-				<field name="ach_login"/>
-				<field name="obj_price"/>
-				<field name="state" select="1"/>
-				<field name="obj_comm"/>
-				<field name="bord_vnd_id"/>
-				<field name="lot_num"/>
-				<field name="lot_est1"/>
-				<field name="lot_est2"/>
-				<field name="lot_type" select="1"/>
-				<field name="auction"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_report_unclassified_objects">
+        <field name="name">report.unclassified.objects</field>
+        <field name="model">report.unclassified.objects</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Unclassified objects">
+                <field name="obj_num" string="Ref" select="1"/>
+                <field name="name" select="1"/>
+                <field name="ach_login"/>
+                <field name="obj_price"/>
+                <field name="state" select="1"/>
+                <field name="obj_comm"/>
+                <field name="bord_vnd_id"/>
+                <field name="lot_num"/>
+                <field name="lot_est1"/>
+                <field name="lot_est2"/>
+                <field name="lot_type" select="1"/>
+                <field name="auction"/>
+            </tree>
+        </field>
+    </record>
 
-	<act_window name="Bordereau de dépôt"
-		domain="[('partner_id', '=', active_id)]"
-		res_model="auction.deposit"
-		src_model="res.partner"
-		id="act_auction_lot_open_deposit"/>
+    <act_window name="Bordereau de dépôt"
+        domain="[('partner_id', '=', active_id)]"
+        res_model="auction.deposit"
+        src_model="res.partner"
+        id="act_auction_lot_open_deposit"/>
 
 </data>
 </openerp>
diff --git a/addons/auction/i18n/ar.po b/addons/auction/i18n/ar.po
index 1d14a28c384..debf2513f15 100644
--- a/addons/auction/i18n/ar.po
+++ b/addons/auction/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/bg.po b/addons/auction/i18n/bg.po
index 5c8194b8612..cda3c98926e 100644
--- a/addons/auction/i18n/bg.po
+++ b/addons/auction/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/bs.po b/addons/auction/i18n/bs.po
index e30cd6d27c0..db0326c779e 100644
--- a/addons/auction/i18n/bs.po
+++ b/addons/auction/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/ca.po b/addons/auction/i18n/ca.po
index 4303f1d04ae..4a278d6fd2e 100644
--- a/addons/auction/i18n/ca.po
+++ b/addons/auction/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/cs.po b/addons/auction/i18n/cs.po
index eec10e163c1..18bf3ed9e1f 100644
--- a/addons/auction/i18n/cs.po
+++ b/addons/auction/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/de.po b/addons/auction/i18n/de.po
index f97445af3ab..537d4bf0a86 100644
--- a/addons/auction/i18n/de.po
+++ b/addons/auction/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po
index 4b0a13ba7ff..48853f5fbb5 100644
--- a/addons/auction/i18n/el.po
+++ b/addons/auction/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/es.po b/addons/auction/i18n/es.po
index 2978801f6bc..71fad6de4b4 100644
--- a/addons/auction/i18n/es.po
+++ b/addons/auction/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/es_AR.po b/addons/auction/i18n/es_AR.po
index f412d3a6c29..d8427d36f0c 100644
--- a/addons/auction/i18n/es_AR.po
+++ b/addons/auction/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/et.po b/addons/auction/i18n/et.po
index 0bea17c7c34..1bba2bd3e32 100644
--- a/addons/auction/i18n/et.po
+++ b/addons/auction/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/fi.po b/addons/auction/i18n/fi.po
index a1d3d5ade29..202c5ea206e 100644
--- a/addons/auction/i18n/fi.po
+++ b/addons/auction/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/fr.po b/addons/auction/i18n/fr.po
index 5617f210b61..93ca23a1f18 100644
--- a/addons/auction/i18n/fr.po
+++ b/addons/auction/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/hi.po b/addons/auction/i18n/hi.po
index 9c30c78d5a9..bae15c441b5 100644
--- a/addons/auction/i18n/hi.po
+++ b/addons/auction/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/hr.po b/addons/auction/i18n/hr.po
index be2e9b916a2..6cd0a5988de 100644
--- a/addons/auction/i18n/hr.po
+++ b/addons/auction/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/hu.po b/addons/auction/i18n/hu.po
index 1d14a28c384..10bfd370817 100644
--- a/addons/auction/i18n/hu.po
+++ b/addons/auction/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/id.po b/addons/auction/i18n/id.po
index 77fe62a2e54..e0567f80f9c 100644
--- a/addons/auction/i18n/id.po
+++ b/addons/auction/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/it.po b/addons/auction/i18n/it.po
index e25e249a6d1..c6b25d25294 100644
--- a/addons/auction/i18n/it.po
+++ b/addons/auction/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/ko.po b/addons/auction/i18n/ko.po
index b3d86ba6dab..8ccfe585bb8 100644
--- a/addons/auction/i18n/ko.po
+++ b/addons/auction/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index 2b98f90a95c..b4cc785abe0 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+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 6894d992b88..5e91e5345e9 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/nl_BE.po b/addons/auction/i18n/nl_BE.po
index db013de5b73..b2c08df53b5 100644
--- a/addons/auction/i18n/nl_BE.po
+++ b/addons/auction/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index c3f9344a650..c5219bd77b3 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/pt.po b/addons/auction/i18n/pt.po
index dfa717be762..dcb1317671f 100644
--- a/addons/auction/i18n/pt.po
+++ b/addons/auction/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 3f3b7ea0d71..42f770b4d14 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/ro.po b/addons/auction/i18n/ro.po
index 050ce3e08b6..b2f1173a009 100644
--- a/addons/auction/i18n/ro.po
+++ b/addons/auction/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/ru.po b/addons/auction/i18n/ru.po
index 8d2edd3ee68..b0175d165d4 100644
--- a/addons/auction/i18n/ru.po
+++ b/addons/auction/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/sl.po b/addons/auction/i18n/sl.po
index 67eedb18d83..4f66d227d93 100644
--- a/addons/auction/i18n/sl.po
+++ b/addons/auction/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/sv.po b/addons/auction/i18n/sv.po
index ee5cae0a034..ee15f8909e1 100644
--- a/addons/auction/i18n/sv.po
+++ b/addons/auction/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/tlh.po b/addons/auction/i18n/tlh.po
index e4631823963..3b02449cb83 100644
--- a/addons/auction/i18n/tlh.po
+++ b/addons/auction/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+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 45c86eafea5..ca7f97b96cb 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/uk.po b/addons/auction/i18n/uk.po
index 8151ba7bfe6..c4f5618176f 100644
--- a/addons/auction/i18n/uk.po
+++ b/addons/auction/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index 72e873580da..58ebcb44914 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/zh_TW.po b/addons/auction/i18n/zh_TW.po
index 4c59ee505dc..22617bf8412 100644
--- a/addons/auction/i18n/zh_TW.po
+++ b/addons/auction/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__openerp__.py
similarity index 100%
rename from addons/audittrail/__terp__.py
rename to addons/audittrail/__openerp__.py
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index dec025b7e98..a79e6a0b6c0 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -1,160 +1,161 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	
-	<!-- Audittrail Rule form -->
-	
-		<record model="ir.ui.view" id="view_audittrail_rule_form">
-			<field name="name">audittrail.rule.form</field>
-			<field name="model">audittrail.rule</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="AuditTrail Rule">
-					<field name="name" select="1" required="1"/>
-					<field name="object_id" select="1"/>
-					<field name="log_read" />
-					<field name="log_write" />
-					<field name="log_unlink" />
-					<field name="log_create" />
-					<field name="action_id" colspan="4" readonly="1"/>
-					<field name="user_id" select="1" colspan="4"/>
-					<field name="state" select="1" readonly="1" />
-					<group colspan="2" col="2">
-						<button string="Subscribe" name="subscribe"
-							type="object" states="draft" />
-						<button string="UnSubscribe" name="unsubscribe"
-							type="object" states="subscribed" />
-					</group>
-				</form>
-			</field>
-		</record>
-		
-		<record model="ir.ui.view" id="view_audittrail_rule_tree">
-			<field name="name">audittrail.rule.tree</field>
-			<field name="model">audittrail.rule</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="AuditTrail Rules">
-					<field name="name" />
-					<field name="object_id"/>
-					<field name="user_id" />
-					<field name="log_read" />
-					<field name="log_write" />
-					<field name="log_unlink" />
-					<field name="log_create" />
-					<field name="state" />
-				</tree>
-			</field>
-		</record>
-		
-	<!-- Action for audittrail rule -->
-		
-		<record model="ir.actions.act_window" id="action_audittrail_rule_tree">
-			<field name="name">Rules</field>
-			<field name="res_model">audittrail.rule</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<!--<field name="view_id" ref="view_audittrail_rule_form" />-->
-		</record>
-		
-		<menuitem name="Audittrails" id="menu_action_audittrail"
-			parent="base.menu_administration" />
-		<menuitem name="Rules" id="menu_action_audittrail_rule_tree"
-			action="action_audittrail_rule_tree" parent="menu_action_audittrail" />
+    <data>
+
+    <!-- Audittrail Rule form -->
+
+        <record model="ir.ui.view" id="view_audittrail_rule_form">
+            <field name="name">audittrail.rule.form</field>
+            <field name="model">audittrail.rule</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="AuditTrail Rule">
+                    <field name="name" select="1" required="1"/>
+                    <field name="object_id" select="1"/>
+                    <field name="log_read" />
+                    <field name="log_write" />
+                    <field name="log_unlink" />
+                    <field name="log_create" />
+                    <field name="action_id" colspan="4" readonly="1"/>
+                    <field name="user_id" select="1" colspan="4"/>
+                    <field name="state" select="1" readonly="1" />
+                    <group colspan="2" col="2">
+                        <button string="Subscribe" name="subscribe"
+                            type="object" states="draft" />
+                        <button string="UnSubscribe" name="unsubscribe"
+                            type="object" states="subscribed" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_audittrail_rule_tree">
+            <field name="name">audittrail.rule.tree</field>
+            <field name="model">audittrail.rule</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="AuditTrail Rules">
+                    <field name="name" />
+                    <field name="object_id"/>
+                    <field name="user_id" />
+                    <field name="log_read" />
+                    <field name="log_write" />
+                    <field name="log_unlink" />
+                    <field name="log_create" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+    <!-- Action for audittrail rule -->
+
+        <record model="ir.actions.act_window" id="action_audittrail_rule_tree">
+            <field name="name">Rules</field>
+            <field name="res_model">audittrail.rule</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <!--<field name="view_id" ref="view_audittrail_rule_form" />-->
+        </record>
+
+        <menuitem name="Audittrails" id="menu_action_audittrail"
+            groups="base.group_extended"
+            parent="base.menu_administration" />
+        <menuitem name="Rules" id="menu_action_audittrail_rule_tree"
+            action="action_audittrail_rule_tree" parent="menu_action_audittrail" />
 
 
-		<record model="ir.actions.act_window" id="action_audittrail_rule_tree_sub">
-			<field name="name">Subscribed Rules</field>
-			<field name="res_model">audittrail.rule</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="domain">[('state','=','subscribed')]</field>
-			<field name="filter" eval="True"/>
-		</record>
-		
-		<!-- AuditTrail Log form -->
+        <record model="ir.actions.act_window" id="action_audittrail_rule_tree_sub">
+            <field name="name">Subscribed Rules</field>
+            <field name="res_model">audittrail.rule</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','subscribed')]</field>
+            <field name="filter" eval="True"/>
+        </record>
 
-		<record model="ir.ui.view" id="view_audittrail_log_form">
-			<field name="name">audittrail.log.form</field>
-			<field name="model">audittrail.log</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="AuditTrail Logs">
-					<field name="timestamp" select="1" required="1" readonly="1"/>
-					<field name="object_id" select="1" readonly="1"/>
-					<field name="method" select="1" readonly="1"/>
-					<field name="user_id" select="1" readonly="1"/>
-					<field name="res_id" readonly="1"/>
-					<field name="name" readonly="1" select="1"/>
-					<field name="line_ids" colspan="4" mode="tree,form"
-						widget="one2many_list" readonly="1">
-						<form string="Log Lines">
-							<field name="field_id" colspan="4"
-								readonly="1" />
-							<newline />
-							<field name="field_description" colspan="4"
-								readonly="1" />
-							<newline />
-							<separator string="Old Value : "
-								colspan="2" />
-							<separator string="New Value : "
-								colspan="2" />
-							<newline />
-							<field name="old_value" nolabel="1"
-								colspan="2" readonly="1" />
-							<field name="new_value" nolabel="1"
-								colspan="2" readonly="1" />
-							<newline />
-							<separator string="Old Value Text : "
-								colspan="2" />
-							<separator string="New Value Text: "
-								colspan="2" />
-							<newline />
-							<field name="old_value_text" nolabel="1"
-								colspan="2" readonly="1" />
-							<field name="new_value_text" nolabel="1"
-								colspan="2" readonly="1" />
-						</form>
+        <!-- AuditTrail Log form -->
 
-						<tree string="Log Lines">
-							<field name="field_description" />
-							<field name="old_value_text" />
-							<field name="new_value_text" />
-						</tree>
-					</field>
-				</form>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_audittrail_log_form">
+            <field name="name">audittrail.log.form</field>
+            <field name="model">audittrail.log</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="AuditTrail Logs">
+                    <field name="timestamp" select="1" required="1" readonly="1"/>
+                    <field name="object_id" select="1" readonly="1"/>
+                    <field name="method" select="1" readonly="1"/>
+                    <field name="user_id" select="1" readonly="1"/>
+                    <field name="res_id" readonly="1"/>
+                    <field name="name" readonly="1" select="1"/>
+                    <field name="line_ids" colspan="4" mode="tree,form"
+                        widget="one2many_list" readonly="1">
+                        <form string="Log Lines">
+                            <field name="field_id" colspan="4"
+                                readonly="1" />
+                            <newline />
+                            <field name="field_description" colspan="4"
+                                readonly="1" />
+                            <newline />
+                            <separator string="Old Value : "
+                                colspan="2" />
+                            <separator string="New Value : "
+                                colspan="2" />
+                            <newline />
+                            <field name="old_value" nolabel="1"
+                                colspan="2" readonly="1" />
+                            <field name="new_value" nolabel="1"
+                                colspan="2" readonly="1" />
+                            <newline />
+                            <separator string="Old Value Text : "
+                                colspan="2" />
+                            <separator string="New Value Text: "
+                                colspan="2" />
+                            <newline />
+                            <field name="old_value_text" nolabel="1"
+                                colspan="2" readonly="1" />
+                            <field name="new_value_text" nolabel="1"
+                                colspan="2" readonly="1" />
+                        </form>
 
-		<record model="ir.ui.view" id="view_audittrail_log_tree">
-			<field name="name">audittrail.log.tree</field>
-			<field name="model">audittrail.log</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="AuditTrail Logs">
-					<field name="timestamp" />
-					<field name="name" />
-					<field name="object_id" />
-					<field name="method" />
-					<field name="user_id" />
-				</tree>
-			</field>
-		</record>
+                        <tree string="Log Lines">
+                            <field name="field_description" />
+                            <field name="old_value_text" />
+                            <field name="new_value_text" />
+                        </tree>
+                    </field>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_audittrail_log_tree">
+            <field name="name">audittrail.log.tree</field>
+            <field name="model">audittrail.log</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="AuditTrail Logs">
+                    <field name="timestamp" />
+                    <field name="name" />
+                    <field name="object_id" />
+                    <field name="method" />
+                    <field name="user_id" />
+                </tree>
+            </field>
+        </record>
 
 <!--  Action for Audittrail Log  -->
 
-		<record model="ir.actions.act_window" id="action_audittrail_log_tree">
-			<field name="name">Logs</field>
-			<field name="res_model">audittrail.log</field>
-			<field name="view_type">form</field>
-		</record>
-		<menuitem name="Logs" id="menu_action_audittrail_log_tree"
-			action="action_audittrail_log_tree" parent="menu_action_audittrail" />
+        <record model="ir.actions.act_window" id="action_audittrail_log_tree">
+            <field name="name">Logs</field>
+            <field name="res_model">audittrail.log</field>
+            <field name="view_type">form</field>
+        </record>
+        <menuitem name="Logs" id="menu_action_audittrail_log_tree"
+            action="action_audittrail_log_tree" parent="menu_action_audittrail" />
 
-		<!--  <wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>-->
-		<menuitem name="View Logs" id="menu_action_log_tree2"
-			action="action_audittrail_view_log" parent="menu_action_audittrail" />
+        <!--  <wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>-->
+        <menuitem name="View Logs" id="menu_action_log_tree2"
+            action="action_audittrail_view_log" parent="menu_action_audittrail" />
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/audittrail/i18n/ar.po b/addons/audittrail/i18n/ar.po
index fdc79cc59d3..3f4c02e6317 100644
--- a/addons/audittrail/i18n/ar.po
+++ b/addons/audittrail/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/bg.po b/addons/audittrail/i18n/bg.po
index b7bc8fed724..b75df54fd55 100644
--- a/addons/audittrail/i18n/bg.po
+++ b/addons/audittrail/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/bs.po b/addons/audittrail/i18n/bs.po
index 91378a66f91..28a4ebac3ed 100644
--- a/addons/audittrail/i18n/bs.po
+++ b/addons/audittrail/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/ca.po b/addons/audittrail/i18n/ca.po
index c0f23ed1e56..8cacacfff7a 100644
--- a/addons/audittrail/i18n/ca.po
+++ b/addons/audittrail/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/cs.po b/addons/audittrail/i18n/cs.po
index fdc79cc59d3..3f4c02e6317 100644
--- a/addons/audittrail/i18n/cs.po
+++ b/addons/audittrail/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index ac23f3c4373..68dfe1fc265 100644
--- a/addons/audittrail/i18n/de.po
+++ b/addons/audittrail/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/el.po b/addons/audittrail/i18n/el.po
index c9a594ff894..09aa9f9fc28 100644
--- a/addons/audittrail/i18n/el.po
+++ b/addons/audittrail/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index 90246309dcd..f5db2c0bb80 100644
--- a/addons/audittrail/i18n/es.po
+++ b/addons/audittrail/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/es_AR.po b/addons/audittrail/i18n/es_AR.po
index 3b132a92acd..f28eacd4396 100644
--- a/addons/audittrail/i18n/es_AR.po
+++ b/addons/audittrail/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/et.po b/addons/audittrail/i18n/et.po
index 7e7885225e7..a0d6f5f7e1b 100644
--- a/addons/audittrail/i18n/et.po
+++ b/addons/audittrail/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index 04d202bfad2..12c15bb34f4 100644
--- a/addons/audittrail/i18n/fr.po
+++ b/addons/audittrail/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/hr.po b/addons/audittrail/i18n/hr.po
index 791ee4d7c0e..85bf4dafba9 100644
--- a/addons/audittrail/i18n/hr.po
+++ b/addons/audittrail/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/hu.po b/addons/audittrail/i18n/hu.po
index fdc79cc59d3..3f4c02e6317 100644
--- a/addons/audittrail/i18n/hu.po
+++ b/addons/audittrail/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/id.po b/addons/audittrail/i18n/id.po
index 80406f221ba..5f6b02b39b2 100644
--- a/addons/audittrail/i18n/id.po
+++ b/addons/audittrail/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index 7300efc8c8d..5ba61eb14a7 100644
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/ko.po b/addons/audittrail/i18n/ko.po
index 438c6078923..1850101ecae 100644
--- a/addons/audittrail/i18n/ko.po
+++ b/addons/audittrail/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 130b235f6bd..dba339f7e5e 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/nl.po b/addons/audittrail/i18n/nl.po
index 17679bdfb4a..abe559d26a5 100644
--- a/addons/audittrail/i18n/nl.po
+++ b/addons/audittrail/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/nl_BE.po b/addons/audittrail/i18n/nl_BE.po
index f23ecf8d7bf..b9d9f9efce6 100644
--- a/addons/audittrail/i18n/nl_BE.po
+++ b/addons/audittrail/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/pl.po b/addons/audittrail/i18n/pl.po
index 6aaea2264b7..f9a3a8bf387 100644
--- a/addons/audittrail/i18n/pl.po
+++ b/addons/audittrail/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/pt.po b/addons/audittrail/i18n/pt.po
index cd51847bae0..cdd7dd1e602 100644
--- a/addons/audittrail/i18n/pt.po
+++ b/addons/audittrail/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index 4eee122091f..62a4cd16f6f 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/ro.po b/addons/audittrail/i18n/ro.po
index 11ed5bb1fa9..957ba118ac3 100644
--- a/addons/audittrail/i18n/ro.po
+++ b/addons/audittrail/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index 148d94c2c32..f09b5610a4b 100644
--- a/addons/audittrail/i18n/ru.po
+++ b/addons/audittrail/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/sl.po b/addons/audittrail/i18n/sl.po
index c2f0a1e5fe4..02b5c04c6f6 100644
--- a/addons/audittrail/i18n/sl.po
+++ b/addons/audittrail/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/sv.po b/addons/audittrail/i18n/sv.po
index 83b539c4b0e..38279434ce0 100644
--- a/addons/audittrail/i18n/sv.po
+++ b/addons/audittrail/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/tlh.po b/addons/audittrail/i18n/tlh.po
index b2dd3acfc19..fa16bb76f5b 100644
--- a/addons/audittrail/i18n/tlh.po
+++ b/addons/audittrail/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+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 0bc8d0c4257..12684ca7d71 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/uk.po b/addons/audittrail/i18n/uk.po
index a7f8f9a5198..29fb8db9d82 100644
--- a/addons/audittrail/i18n/uk.po
+++ b/addons/audittrail/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+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 b491e2e94f3..02cb4317f0c 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/zh_TW.po b/addons/audittrail/i18n/zh_TW.po
index 9c361325c4d..55b6fd6014d 100644
--- a/addons/audittrail/i18n/zh_TW.po
+++ b/addons/audittrail/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_action_rule/__terp__.py b/addons/base_action_rule/__openerp__.py
similarity index 100%
rename from addons/base_action_rule/__terp__.py
rename to addons/base_action_rule/__openerp__.py
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 06837e2c2da..09bbb2e2f5f 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<menuitem id="menu_base_action_rule" name="Action Rule"
-    		parent="base.menu_base_config" sequence="0" />
+        <menuitem id="menu_base_action_rule" name="Action Rule"
+            groups="base.group_extended"
+            parent="base.menu_base_config" sequence="0" />
 
-    	<!--
-			Action Rule Form View
-		-->
-   		<record id="view_base_action_rule_form" model="ir.ui.view">
-   			<field name="name">base.action.rule.form</field>
+        <!--
+            Action Rule Form View
+        -->
+           <record id="view_base_action_rule_form" model="ir.ui.view">
+               <field name="name">base.action.rule.form</field>
             <field name="model">base.action.rule</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action Rule">
-                	<field name="name" select="1"/>
+                    <field name="name" select="1"/>
                     <field name="active"/>
-                	<field name="max_level" />
+                    <field name="max_level" />
                     <separator colspan="4" string="Rule lines"/>
-                	<field name="rule_lines" colspan="4" nolabel="1"/>
+                    <field name="rule_lines" colspan="4" nolabel="1"/>
                 </form>
             </field>
-   		</record>
+           </record>
 
 <!-- Action Rule Tree View -->
 
-   		<record id="view_base_action_rule_tree" model="ir.ui.view">
-   			<field name="name">base.action.rule.tree</field>
+           <record id="view_base_action_rule_tree" model="ir.ui.view">
+               <field name="name">base.action.rule.tree</field>
             <field name="model">base.action.rule</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Action Rule">
-                	<field name="name" colspan="4"/>
-                	<field name="max_level"/>
-                	<field name="rule_lines" colspan="4" nolabel="1"/>
+                    <field name="name" colspan="4"/>
+                    <field name="max_level"/>
+                    <field name="rule_lines" colspan="4" nolabel="1"/>
                 </tree>
             </field>
-   		</record>
+           </record>
 
 <!-- Action Rule Action -->
 
-   		<record id="base_action_rule_act" model="ir.actions.act_window">
+           <record id="base_action_rule_act" model="ir.actions.act_window">
             <field name="name">Action Rules</field>
             <field name="res_model">base.action.rule</field>
             <field name="view_type">form</field>
@@ -47,11 +48,11 @@
             <field name="view_id" ref="view_base_action_rule_tree"/>
         </record>
 
-   		<menuitem id="menu_base_action_rule_form"
-   			parent="menu_base_action_rule" action="base_action_rule_act" />
+           <menuitem id="menu_base_action_rule_form"
+               parent="menu_base_action_rule" action="base_action_rule_act" />
 
-   		<!--
-        	Action Rule Lines Form View
+           <!--
+            Action Rule Lines Form View
         -->
         <record id="view_base_action_rule_line_form" model="ir.ui.view">
             <field name="name">base.action.rule.line.form</field>
@@ -60,13 +61,13 @@
             <field name="arch" type="xml">
                 <form string="Action Rule Line">
                     <field name="name" select="1"/>
-                    <field name="active" select="2"/>
+                    <field name="active"/>
                     <notebook colspan="4">
                         <page string="Conditions">
                             <group col="2" colspan="2" name="model">
                                 <separator colspan="4" string="Conditions on Model Fields"/>
                                 <field name="regex_name" string="Regex on Model Name" colspan="2"/>
-                                <field name="trg_user_id" select="2"/>
+                                <field name="trg_user_id"/>
                             </group>
                             <group col="2" colspan="2" name="partner">
                                 <separator colspan="4" string="Conditions on Model Partner"/>
@@ -75,8 +76,8 @@
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Conditions on States"/>
-                                <field name="trg_state_from" select="2"/>
-                                <field name="trg_state_to" select="2"/>
+                                <field name="trg_state_from"/>
+                                <field name="trg_state_to"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Conditions on Priority Range"/>
@@ -105,7 +106,7 @@
                             <field name="act_remind_attach"/>
                             <field name="act_remind_user"/>
                             <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
-                            	<field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
+                                <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
                             </group>
                             <field colspan="4" name="act_email_cc"/>
                             <separator colspan="4" string="Server Action to be Triggered"/>
diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__openerp__.py
similarity index 100%
rename from addons/base_calendar/__terp__.py
rename to addons/base_calendar/__openerp__.py
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 6a29b023301..30bc83e0616 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -91,7 +91,7 @@ def real_id2base_calendar_id(real_id, recurrent_date):
 
     if real_id and recurrent_date:
         recurrent_date = time.strftime("%Y%m%d%H%M%S", \
-                         time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
+                            time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
         return '%d-%s' % (real_id, recurrent_date)
     return real_id
 
@@ -253,7 +253,7 @@ class calendar_attendee(osv.osv):
                     result[id][name] = ''
                     continue
                 else:
-                    result[id][name] =  self._get_address(attdata.sent_by_uid.name, \
+                    result[id][name] = self._get_address(attdata.sent_by_uid.name, \
                                         attdata.sent_by_uid.address_id.email)
             if name == 'cn':
                 if attdata.user_id:
@@ -327,59 +327,60 @@ class calendar_attendee(osv.osv):
         'cutype': fields.selection([('individual', 'Individual'), \
                     ('group', 'Group'), ('resource', 'Resource'), \
                     ('room', 'Room'), ('unknown', '') ], \
-                    'Invite Type', help="Specify the type of Invitation"),
-        'member': fields.char('Member', size=124,
-                    help="Indicate the groups that the attendee belongs to"),
+                    'Invite Type', help="Specify the type of Invitation"), 
+        'member': fields.char('Member', size=124, 
+                    help="Indicate the groups that the attendee belongs to"), 
         'role': fields.selection([('req-participant', 'Participation required'), \
                     ('chair', 'Chair Person'), \
                     ('opt-participant', 'Optional Participation'), \
                     ('non-participant', 'For information Purpose')], 'Role', \
-                    help='Participation role for the calendar user'),
-        'state': fields.selection([('tentative', 'Tentative'),
-                        ('needs-action', 'Needs Action'),
-                        ('accepted', 'Accepted'),
-                        ('declined', 'Declined'),
-                        ('delegated', 'Delegated')], 'State', readonly=True,\
-                        help="Status of the attendee's participation"),
-        'rsvp':  fields.boolean('Required Reply?',
-                    help="Indicats whether the favor of a reply is requested"),
+                    help='Participation role for the calendar user'), 
+        'state': fields.selection([('tentative', 'Tentative'), 
+                        ('needs-action', 'Needs Action'), 
+                        ('accepted', 'Accepted'), 
+                        ('declined', 'Declined'), 
+                        ('delegated', 'Delegated')], 'State', readonly=True, \
+                        help="Status of the attendee's participation"), 
+        'rsvp':  fields.boolean('Required Reply?', 
+                    help="Indicats whether the favor of a reply is requested"), 
         'delegated_to': fields.function(_compute_data, method=True, \
                 string='Delegated To', type="char", size=124, store=True, \
                 multi='delegated_to', help="The users that the original \
-request was delegated to"),
+request was delegated to"), 
         'delegated_from': fields.function(_compute_data, method=True, string=\
-            'Delegated From', type="char", store=True, size=124, multi='delegated_from'),
-        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel',\
-                                       'attendee_id', 'parent_id', 'Delegrated From'),
-        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel',\
-                                      'attendee_id', 'child_id', 'Delegrated To'),
-        'sent_by': fields.function(_compute_data, method=True, string='Sent By',\
-                         type="char", multi='sent_by', store=True, size=124,\
-                         help="Specify the user that is acting on behalf of the calendar user"),
-        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User',\
-                             type="many2one", relation="res.users", multi='sent_by_uid'),
-        'cn': fields.function(_compute_data, method=True, string='Common name',\
-                             type="char", size=124, multi='cn', store=True),
+            'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', \
+                                    'attendee_id', 'parent_id', 'Delegrated From'), 
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', \
+                                      'attendee_id', 'child_id', 'Delegrated To'), 
+        'sent_by': fields.function(_compute_data, method=True, string='Sent By', \
+                        type="char", multi='sent_by', store=True, size=124, \
+                        help="Specify the user that is acting on behalf of the calendar user"), 
+        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', \
+                            type="many2one", relation="res.users", multi='sent_by_uid'), 
+        'cn': fields.function(_compute_data, method=True, string='Common name', \
+                            type="char", size=124, multi='cn', store=True), 
         'dir': fields.char('URI Reference', size=124, help="Reference to the URI\
-                     that points to the directory information corresponding to the attendee."),
-        'language':  fields.function(_compute_data, method=True, string='Language',\
-                     type="selection", selection=_lang_get, multi='language',\
-                     store=True, help="To specify the language for text values in a\
-                      property or property parameter."),
-        'user_id': fields.many2one('res.users', 'User'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Contact'),
-        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one',\
-                        relation='res.partner', string='Partner', help="Partner related to contact"),
-        'email': fields.char('Email', size=124, help="Email of Invited Person"),
-        'event_date': fields.function(_compute_data, method=True, string='Event Date',\
-                             type="datetime", multi='event_date'),
-        'event_end_date': fields.function(_compute_data, method=True, string='Event End Date',\
-                                 type="datetime", multi='event_end_date'),
-        'ref': fields.reference('Event Ref', selection=_links_get, size=128),
-        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"),
+that points to the directory information corresponding to the attendee."), 
+        'language': fields.function(_compute_data, method=True, string='Language', \
+                    type="selection", selection=_lang_get, multi='language', \
+                    store=True, help="To specify the language for text values in a\
+property or property parameter."), 
+        'user_id': fields.many2one('res.users', 'User'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
+        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', \
+                        relation='res.partner', string='Partner', help="Partner related to contact"), 
+        'email': fields.char('Email', size=124, help="Email of Invited Person"), 
+        'event_date': fields.function(_compute_data, method=True, string='Event Date', \
+                            type="datetime", multi='event_date'), 
+        'event_end_date': fields.function(_compute_data, method=True, \
+                            string='Event End Date', type="datetime", \
+                            multi='event_end_date'), 
+        'ref': fields.reference('Event Ref', selection=_links_get, size=128), 
+        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"), 
      }
     _defaults = {
-        'state':  lambda *x: 'needs-action',
+        'state': lambda *x: 'needs-action', 
     }
 
     response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
@@ -421,7 +422,7 @@ request was delegated to"),
             if msg_actions['state'] in ['YES', 'NO', 'MAYBE']:
                 mapping = {'YES': 'accepted', 'NO': 'declined', 'MAYBE': 'tentative'}
                 status = mapping[msg_actions['state']]
-                print 'Got response for invitation id: %s as %s'  % (ids, status)
+                print 'Got response for invitation id: %s as %s' % (ids, status)
                 self.write(cr, uid, ids, {'state': status})
         return True
 
@@ -440,37 +441,37 @@ request was delegated to"),
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
             sign = '<br>'.join(sign and sign.split('\n') or [])
             res_obj = att.ref
-            sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
+            sub = '[%s Invitation][%d] %s' % (company, att.id, res_obj.name)
             att_infos = []
-            other_invitaion_ids = self.search(cr, uid, [('ref','=', att.ref._name + ',' + str(att.ref.id))])
+            other_invitaion_ids = self.search(cr, uid, [('ref', '=', att.ref._name + ',' + str(att.ref.id))])
             for att2 in self.browse(cr, uid, other_invitaion_ids):
                 att_infos.append(((att2.user_id and att2.user_id.name) or \
                              (att2.partner_id and att2.partner_id.name) or \
-                                att2.email) +  ' - Status: ' + att2.state.title())
-            body_vals = {'name': res_obj.name,
-                'start_date': res_obj.date,
-                'end_date': res_obj.date_deadline or False,
-                'description': res_obj.description or '-',
-                'location': res_obj.location or '-',
-                'attendees': '<br>'.join(att_infos),
-                'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User',
-                'sign': sign,
-                'company': company
+                                att2.email) + ' - Status: ' + att2.state.title())
+            body_vals = {'name': res_obj.name, 
+                        'start_date': res_obj.date, 
+                        'end_date': res_obj.date_deadline or False, 
+                        'description': res_obj.description or '-', 
+                        'location': res_obj.location or '-', 
+                        'attendees': '<br>'.join(att_infos), 
+                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
+                        'sign': sign, 
+                        'company': company
             }
             body = html_invitation % body_vals
             if mail_to and email_from:
                 tools.email_send(
-                    email_from,
-                    mail_to,
-                    sub,
-                    body,
-                    subtype='html',
-                    reply_to=email_from
-                )
+                        email_from, 
+                        mail_to, 
+                        sub, 
+                        body, 
+                        subtype='html', 
+                        reply_to=email_from
+                    )
             return True
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
         """
-        Make entry on email and availbility  on change of user_id field.
+        Make entry on email and availbility on change of user_id field.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of calendar attendee’s IDs.
@@ -496,7 +497,7 @@ request was delegated to"),
 
     def do_accept(self, cr, uid, ids, context=None, *args):
         """
-        Update state which value is  accepted.
+        Update state which value is accepted.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of calendar attendee’s IDs.
@@ -512,7 +513,7 @@ request was delegated to"),
                 mod_obj = self.pool.get(vals.ref._name)
                 if vals.ref:
                     if vals.ref.user_id.id != user.id:
-                        defaults = {'user_id':  user.id}
+                        defaults = {'user_id': user.id}
                         new_event = mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
             self.write(cr, uid, vals.id, {'state': 'accepted'}, context)
 
@@ -539,7 +540,7 @@ request was delegated to"),
             context = {}
         if not vals.get("email") and vals.get("cn"):
             cnval = vals.get("cn").split(':')
-            email =  filter(lambda x:x.__contains__('@'), cnval)
+            email = filter(lambda x:x.__contains__('@'), cnval)
             vals['email'] = email[0]
             vals['cn'] = vals.get("cn")
         res = super(calendar_attendee, self).create(cr, uid, vals, context)
@@ -551,26 +552,30 @@ class res_alarm(osv.osv):
     _name = 'res.alarm'
     _description = 'Basic Alarm Information'
     _columns = {
-        'name':fields.char('Name', size=256, required=True),
-        'trigger_occurs': fields.selection([('before', 'Before'), ('after', 'After')], \
-                                        'Triggers', required=True),
-        'trigger_interval': fields.selection([('minutes', 'Minutes'), ('hours', 'Hours'), \
-                ('days', 'Days')], 'Interval', required=True),
-        'trigger_duration':  fields.integer('Duration', required=True),
-        'trigger_related':  fields.selection([('start', 'The event starts'), ('end', \
-                                       'The event ends')], 'Related to', required=True),
+        'name':fields.char('Name', size=256, required=True), 
+        'trigger_occurs': fields.selection([('before', 'Before'), \
+                                            ('after', 'After')], \
+                                        'Triggers', required=True), 
+        'trigger_interval': fields.selection([('minutes', 'Minutes'), \
+                                                ('hours', 'Hours'), \
+                                                ('days', 'Days')], 'Interval', \
+                                                required=True), 
+        'trigger_duration': fields.integer('Duration', required=True), 
+        'trigger_related': fields.selection([('start', 'The event starts'), \
+                                            ('end', 'The event ends')], \
+                                            'Related to', required=True), 
         'duration': fields.integer('Duration', help="""Duration' and 'Repeat' \
-are both optional, but if one occurs, so MUST the other"""),
-        'repeat': fields.integer('Repeat'),
+are both optional, but if one occurs, so MUST the other"""), 
+        'repeat': fields.integer('Repeat'), 
         'active': fields.boolean('Active', help="If the active field is set to \
                     true, it will allow you to hide the event alarm information without removing it.")
     }
     _defaults = {
-        'trigger_interval':  lambda *x: 'minutes',
-        'trigger_duration': lambda *x: 5,
-        'trigger_occurs': lambda *x: 'before',
-        'trigger_related': lambda *x: 'start',
-        'active': lambda *x: 1,
+        'trigger_interval': lambda *x: 'minutes', 
+        'trigger_duration': lambda *x: 5, 
+        'trigger_occurs': lambda *x: 'before', 
+        'trigger_related': lambda *x: 'start', 
+        'active': lambda *x: 1, 
     }
 
     def do_alarm_create(self, cr, uid, ids, model, date, context={}):
@@ -598,20 +603,20 @@ are both optional, but if one occurs, so MUST the other"""),
             self.do_alarm_unlink(cr, uid, [data.id], model)
             if basic_alarm:
                 vals = {
-                    'action': 'display',
-                    'description': data.description,
-                    'name': data.name,
-                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))],
-                    'trigger_related': basic_alarm.trigger_related,
-                    'trigger_duration': basic_alarm.trigger_duration,
-                    'trigger_occurs': basic_alarm.trigger_occurs,
-                    'trigger_interval': basic_alarm.trigger_interval,
-                    'duration': basic_alarm.duration,
-                    'repeat': basic_alarm.repeat,
-                    'state': 'run',
-                    'event_date': data[date],
-                    'res_id': data.id,
-                    'model_id': model_id,
+                    'action': 'display', 
+                    'description': data.description, 
+                    'name': data.name, 
+                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))], 
+                    'trigger_related': basic_alarm.trigger_related, 
+                    'trigger_duration': basic_alarm.trigger_duration, 
+                    'trigger_occurs': basic_alarm.trigger_occurs, 
+                    'trigger_interval': basic_alarm.trigger_interval, 
+                    'duration': basic_alarm.duration, 
+                    'repeat': basic_alarm.repeat, 
+                    'state': 'run', 
+                    'event_date': data[date], 
+                    'res_id': data.id, 
+                    'model_id': model_id, 
                     'user_id': uid
                  }
                 alarm_id = alarm_obj.create(cr, uid, vals)
@@ -640,7 +645,7 @@ are both optional, but if one occurs, so MUST the other"""),
             if alarm_ids:
                 alarm_obj.unlink(cr, uid, alarm_ids)
                 cr.execute('Update %s set base_calendar_alarm_id=NULL, alarm_id=NULL\
-                             where id=%s' % (model_obj._table, datas.id))
+                            where id=%s' % (model_obj._table, datas.id))
         cr.commit()
         return True
 
@@ -653,41 +658,40 @@ class calendar_alarm(osv.osv):
     __attribute__ = {}
 
     _columns = {
-        'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'),
-        'name': fields.char('Summary', size=124, help="""Contains the text to be \
-                     used as the message subject for email \
-                     or contains the text to be used for display"""),
-        'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
-                ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
-                required=True, help="Defines the action to be invoked when an alarm is triggered"),
-        'description': fields.text('Description', help='Provides a more complete \
-                            description of the calendar component, than that \
-                            provided by the "SUMMARY" property'),
-        'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
-                                      'alarm_id', 'attendee_id', 'Attendees', readonly=True),
-        'attach': fields.binary('Attachment', help="""* Points to a sound resource,\
-                     which is rendered when the alarm is triggered for audio,
-                    * File which is intended to be sent as message attachments for email,
-                    * Points to a procedure resource, which is invoked when\
-                      the alarm is triggered for procedure."""),
-        'res_id': fields.integer('Resource ID'),
-        'model_id': fields.many2one('ir.model', 'Model'),
-        'user_id': fields.many2one('res.users', 'Owner'),
-        'event_date': fields.datetime('Event Date'),
-        'event_end_date': fields.datetime('Event End Date'),
-        'trigger_date': fields.datetime('Trigger Date', readonly="True"),
-        'state':fields.selection([
-                    ('draft', 'Draft'),
-                    ('run', 'Run'),
-                    ('stop', 'Stop'),
-                    ('done', 'Done'),
-                ], 'State', select=True, readonly=True),
-     }
+            'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'), 
+            'name': fields.char('Summary', size=124, help="""Contains the text to be \
+                        used as the message subject for email \
+                        or contains the text to be used for display"""), 
+            'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
+                    ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
+                    required=True, help="Defines the action to be invoked when an alarm is triggered"), 
+            'description': fields.text('Description', help='Provides a more complete \
+                                description of the calendar component, than that \
+                                provided by the "SUMMARY" property'), 
+            'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
+                                          'alarm_id', 'attendee_id', 'Attendees', readonly=True), 
+            'attach': fields.binary('Attachment', help="""* Points to a sound resource,\
+                         which is rendered when the alarm is triggered for audio,
+                        * File which is intended to be sent as message attachments for email,
+                        * Points to a procedure resource, which is invoked when\
+                          the alarm is triggered for procedure."""), 
+            'res_id': fields.integer('Resource ID'), 
+            'model_id': fields.many2one('ir.model', 'Model'), 
+            'user_id': fields.many2one('res.users', 'Owner'), 
+            'event_date': fields.datetime('Event Date'), 
+            'event_end_date': fields.datetime('Event End Date'), 
+            'trigger_date': fields.datetime('Trigger Date', readonly="True"), 
+            'state':fields.selection([('draft', 'Draft'), 
+                                        ('run', 'Run'), 
+                                        ('stop', 'Stop'), 
+                                        ('done', 'Done'), 
+                                    ], 'State', select=True, readonly=True), 
+        }
 
     _defaults = {
-        'action':  lambda *x: 'email',
-        'state': lambda *x: 'run',
-     }
+                'action': lambda *x: 'email', 
+                'state': lambda *x: 'run', 
+                }
 
     def create(self, cr, uid, vals, context={}):
         """
@@ -708,7 +712,7 @@ class calendar_alarm(osv.osv):
                 delta = timedelta(hours=vals['trigger_duration'])
             if vals['trigger_interval'] == 'minutes':
                 delta = timedelta(minutes=vals['trigger_duration'])
-            trigger_date =  dtstart + (vals['trigger_occurs'] == 'after' and delta or -delta)
+            trigger_date = dtstart + (vals['trigger_occurs'] == 'after' and delta or -delta)
             vals['trigger_date'] = trigger_date
         res = super(calendar_alarm, self).create(cr, uid, vals, context)
         return res
@@ -738,12 +742,12 @@ class calendar_alarm(osv.osv):
         for alarm in self.browse(cr, uid, alarm_ids):
             if alarm.action == 'display':
                 value = {
-                   'name': alarm.name,
-                   'act_from': alarm.user_id.id,
-                   'act_to': alarm.user_id.id,
-                   'body': alarm.description,
-                   'trigger_date': alarm.trigger_date,
-                   'ref_doc1':  '%s,%s'  % (alarm.model_id.model, alarm.res_id)
+                   'name': alarm.name, 
+                   'act_from': alarm.user_id.id, 
+                   'act_to': alarm.user_id.id, 
+                   'body': alarm.description, 
+                   'trigger_date': alarm.trigger_date, 
+                   'ref_doc1': '%s,%s' % (alarm.model_id.model, alarm.res_id)
                 }
                 request_id = request_obj.create(cr, uid, value)
                 request_ids = [request_id]
@@ -755,7 +759,7 @@ class calendar_alarm(osv.osv):
                 request_obj.request_send(cr, uid, request_ids)
 
             if alarm.action == 'email':
-                sub = '[Openobject Remainder] %s'  % (alarm.name)
+                sub = '[Openobject Remainder] %s' % (alarm.name)
                 body = """
                 Name: %s
                 Date: %s
@@ -772,9 +776,9 @@ class calendar_alarm(osv.osv):
                     mail_to.append(att.user_id.address_id.email)
                 if mail_to:
                     tools.email_send(
-                        tools.config.get('email_from', False),
-                        mail_to,
-                        sub,
+                        tools.config.get('email_from', False), 
+                        mail_to, 
+                        sub, 
                         body
                     )
             self.write(cr, uid, [alarm.id], {'state':'done'})
@@ -813,7 +817,7 @@ class calendar_event(osv.osv):
         if end_date and not duration:
             end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
             diff = end - start
-            duration =  float(diff.days)* 24 + (float(diff.seconds) / 3600)
+            duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
             value['duration'] = round(duration, 2)
         elif not end_date:
             end = start + timedelta(hours=duration)
@@ -825,15 +829,16 @@ class calendar_event(osv.osv):
         Set rule string.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
-        @param id: List of  calendar event's ids.
+        @param id: List of calendar event's ids.
         @param context: A standard dictionary for contextual values
         @return: dictionary of rrule value.
         """
-        cr.execute("UPDATE %s set freq='',interval=0,count=0,end_date=Null,\
+        cr.execute("UPDATE %s set freq='None',interval=0,count=0,end_date=Null,\
                     mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\
-                    day=0,select1=False,month_list=0 ,byday=False where id=%s" % (self._table, id))
+                    day=0,select1='date',month_list=Null ,byday=Null where id=%s" % (self._table, id))
         
         if not value:
+            cr.execute("UPDATE %s set rrule_type='none' where id=%s" % (self._table, id))
             return True
         val = {}
         for part in value.split(';'):
@@ -846,7 +851,9 @@ class calendar_event(osv.osv):
         ans = value.split(';')
         for i in ans:
             val[i.split('=')[0].lower()] = i.split('=')[1].lower()
-        if int(val.get('interval')) > 1: #If interval is other than 1 rule is custom
+        if not val.get('interval'):
+            rrule_type = 'custom'
+        elif int(val.get('interval')) > 1: #If interval is other than 1 rule is custom
             rrule_type = 'custom'
 
         qry = "UPDATE %(table)s set rrule_type=\'%(rule_type)s\' "
@@ -873,8 +880,12 @@ class calendar_event(osv.osv):
     
                 if val.get('byday'):
                     d = val.get('byday')
-                    new_val['byday'] = d[:1]
-                    new_val['week_list'] = d[1:].upper()
+                    if '-' in d:
+                        new_val['byday'] = d[:2]
+                        new_val['week_list'] = d[2:4].upper()
+                    else:
+                        new_val['byday'] = d[:1]
+                        new_val['week_list'] = d[1:3].upper()
                     new_val['select1'] = 'day'
     
                 if val.get('bymonth'):
@@ -901,92 +912,100 @@ class calendar_event(osv.osv):
         Get rule string.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
-        @param id: List of  calendar event's ids.
+        @param id: List of calendar event's ids.
         @param context: A standard dictionary for contextual values
         @return: dictionary of rrule value.
         """
         result = {}
-        for datas in self.read(cr, uid, ids):
+        for datas in self.read(cr, uid, ids, context=context):
+            event = datas['id']
             if datas.get('rrule_type'):
                 if datas.get('rrule_type') == 'none':
                     result[event] = False
                 elif datas.get('rrule_type') == 'custom':
-                    rrule_custom = self.compute_rule_string(cr, uid, datas)
+                    if datas.get('interval', 0) < 0:
+                        raise osv.except_osv('Warning!', 'Interval can not be Negative')
+                    if datas.get('count', 0) < 0:
+                        raise osv.except_osv('Warning!', 'Count can not be Negative')
+                    rrule_custom = self.compute_rule_string(cr, uid, datas,\
+                                                         context=context)
                     result[event] = rrule_custom
                 else:
-                    result[event] = self.compute_rule_string(cr, uid, {'freq':\
-                                        datas.get('rrule_type').upper(), \
-                                      'interval': 1}, context=context)
+                    result[event] = self.compute_rule_string(cr, uid, {'freq': datas.get('rrule_type').upper(), 'interval': 1}, context=context)
 
         return result
 
     _columns = {
-        'id': fields.integer('ID'),
-        'sequence': fields.integer('Sequence'),
-        'name': fields.char('Description', size=64, required=True),
-        'date': fields.datetime('Date'),
-        'date_deadline': fields.datetime('Deadline'),
-        'create_date': fields.datetime('Created', readonly=True),
-        'duration': fields.float('Duration'),
-        'description': fields.text('Your action'),
+        'id': fields.integer('ID'), 
+        'sequence': fields.integer('Sequence'), 
+        'name': fields.char('Description', size=64, required=True), 
+        'date': fields.datetime('Date'), 
+        'date_deadline': fields.datetime('Deadline'), 
+        'create_date': fields.datetime('Created', readonly=True), 
+        'duration': fields.float('Duration'), 
+        'description': fields.text('Your action'), 
         'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
              ('confidential', 'Confidential')], 'Mark as'),
         'location': fields.char('Location', size=264, help="Location of Event"),
-        'show_as': fields.selection([('free', 'Free'), \
-              ('busy', 'Busy')], 'Show as'),
-        'base_calendar_url': fields.char('Caldav URL', size=264),
+        'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
+                                                'Show as'), 
+        'base_calendar_url': fields.char('Caldav URL', size=264), 
         'exdate': fields.text('Exception Date/Times', help="This property \
-                    defines the list of date/time exceptions for arecurring calendar component."),
+defines the list of date/time exceptions for arecurring calendar component."), 
         'exrule': fields.char('Exception Rule', size=352, help="defines a \
-                    rule or repeating pattern for anexception to a recurrence set"),
-        'rrule': fields.function(_get_rulestring, type='char', size=124, method=True,\
-                     string='Recurrent Rule', store=True, fnct_inv=_set_rrulestring),
+                    rule or repeating pattern for anexception to a recurrence set"), 
+        'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, \
+                                    string='Recurrent Rule', store=True, \
+                                    fnct_inv=_set_rrulestring, help='Defines a\
+ rule or repeating pattern for recurring events\n\
+e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
+        FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU'), 
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
-            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
-            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'),
-        'alarm_id': fields.many2one('res.alarm', 'Alarm'),
-        'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
-        'recurrent_uid': fields.integer('Recurrent ID'),
-        'recurrent_id': fields.datetime('Recurrent ID date'),
-        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24,\
-                         string='Timezone', store=True),
-        'user_id': fields.many2one('res.users', 'Responsible'),
+                            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
+                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'), 
+        'alarm_id': fields.many2one('res.alarm', 'Alarm'), 
+        'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
+        'recurrent_uid': fields.integer('Recurrent ID'), 
+        'recurrent_id': fields.datetime('Recurrent ID date'), 
+        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, \
+                         string='Timezone', store=True), 
+        'user_id': fields.many2one('res.users', 'Responsible'), 
         'freq': fields.selection([('None', 'No Repeat'), \
-            ('secondly', 'Secondly'), \
-            ('minutely', 'Minutely'), \
-            ('hourly', 'Hourly'), \
-            ('daily', 'Daily'), \
-            ('weekly', 'Weekly'), \
-            ('monthly', 'Monthly'), \
-            ('yearly', 'Yearly')], 'Frequency'),
-        'interval': fields.integer('Interval'),
-        'count': fields.integer('Count'),
-        'mo': fields.boolean('Mon'),
-        'tu': fields.boolean('Tue'),
-        'we': fields.boolean('Wed'),
-        'th': fields.boolean('Thu'),
-        'fr': fields.boolean('Fri'),
-        'sa': fields.boolean('Sat'),
-        'su': fields.boolean('Sun'),
+                                ('secondly', 'Secondly'), \
+                                ('minutely', 'Minutely'), \
+                                ('hourly', 'Hourly'), \
+                                ('daily', 'Daily'), \
+                                ('weekly', 'Weekly'), \
+                                ('monthly', 'Monthly'), \
+                                ('yearly', 'Yearly')], 'Frequency'), 
+        'interval': fields.integer('Interval'), 
+        'count': fields.integer('Count'), 
+        'mo': fields.boolean('Mon'), 
+        'tu': fields.boolean('Tue'), 
+        'we': fields.boolean('Wed'), 
+        'th': fields.boolean('Thu'), 
+        'fr': fields.boolean('Fri'), 
+        'sa': fields.boolean('Sat'), 
+        'su': fields.boolean('Sun'), 
         'select1': fields.selection([('date', 'Date of month'), \
-            ('day', 'Day of month')], 'Option'),
-        'day': fields.integer('Date of month'),
+                                    ('day', 'Day of month')], 'Option'), 
+        'day': fields.integer('Date of month'), 
         'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
-           ('WE', 'Wednesday'), ('TH', 'Thursday'), \
-           ('FR', 'Friday'), ('SA', 'Saturday'), \
-           ('SU', 'Sunday')], 'Weekday'),
+                                   ('WE', 'Wednesday'), ('TH', 'Thursday'), \
+                                   ('FR', 'Friday'), ('SA', 'Saturday'), \
+                                   ('SU', 'Sunday')], 'Weekday'), 
         'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
-           ('3', 'Third'), ('4', 'Fourth'), \
-           ('5', 'Fifth'), ('-1', 'Last')], 'By day'),
-        'month_list': fields.selection(months.items(), 'Month'),
+                                   ('3', 'Third'), ('4', 'Fourth'), \
+                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'), 
+        'month_list': fields.selection(months.items(), 'Month'), 
         'end_date': fields.date('Repeat Until')
     }
     _defaults = {
-         'class': lambda *a: 'public',
-         'show_as': lambda *a: 'busy',
-         'freq':  lambda *x: 'None',
-         'select1':  lambda *x: 'date',
-         'interval':  lambda *x: 1,
+         'class': lambda *a: 'public', 
+         'show_as': lambda *a: 'busy', 
+         'freq': lambda *x: 'None', 
+         'select1': lambda *x: 'date', 
+         'interval': lambda *x: 1, 
     }
 
     def modify_this(self, cr, uid, event_id, defaults, real_date, context=None, *args):
@@ -1004,11 +1023,11 @@ class calendar_event(osv.osv):
         event_id = base_calendar_id2real_id(event_id)
         datas = self.read(cr, uid, event_id, context=context)
         defaults.update({
-           'recurrent_uid': base_calendar_id2real_id(datas['id']),
-           'recurrent_id': defaults.get('date') or real_date,
-           'rrule_type': 'none',
-           'rrule': ''
-        })
+                        'recurrent_uid': base_calendar_id2real_id(datas['id']), 
+                        'recurrent_id': defaults.get('date') or real_date, 
+                        'rrule_type': 'none', 
+                        'rrule': ''
+                        })
         exdate = datas['exdate'] and datas['exdate'].split(',') or []
         if real_date and defaults.get('date'):
             exdate.append(real_date)
@@ -1032,7 +1051,7 @@ class calendar_event(osv.osv):
             defaults.update({'table': self._table})
 
             qry = "UPDATE %(table)s set name = '%(name)s', \
-                            date = '%(date)s',  date_deadline = '%(date_deadline)s'"
+                            date = '%(date)s', date_deadline = '%(date_deadline)s'"
             if defaults.get('alarm_id'):
                 qry += ", alarm_id = %(alarm_id)s"
             if defaults.get('location'):
@@ -1060,7 +1079,7 @@ class calendar_event(osv.osv):
         result = []
         if ids and (base_start_date or base_until_date):
             cr.execute("select m.id, m.rrule, m.date, m.date_deadline, \
-                            m.exdate  from "  + self._table + \
+                            m.exdate from " + self._table + \
                             " m where m.id in ("\
                             + ','.join(map(lambda x: str(x), ids))+")")
 
@@ -1129,7 +1148,7 @@ class calendar_event(osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param datas: dictionary of freq and interval value.
-        @return: string value which compute  FREQILY;INTERVAL
+        @return: string value which compute FREQILY;INTERVAL
         """
 
         weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
@@ -1141,9 +1160,8 @@ class calendar_event(osv.osv):
         if freq == 'None':
             return ''
         
-        if datas.get('interval') < 1:
-                raise osv.except_osv(_('Error!'), ("Please select proper Interval"))
-
+        interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or ''
+        
         if freq == 'weekly':
 
             byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
@@ -1159,7 +1177,7 @@ class calendar_event(osv.osv):
                 monthstring = ';BYMONTHDAY=' + str(datas.get('day'))
 
         elif freq == 'yearly':
-            if datas.get('select1')=='date'  and (datas.get('day') < 1 or datas.get('day') > 31):
+            if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
                 raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
             bymonth = ';BYMONTH=' + str(datas.get('month_list'))
             if datas.get('select1')=='day':
@@ -1170,19 +1188,19 @@ class calendar_event(osv.osv):
 
         if datas.get('end_date'):
             datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
-        enddate = (datas.get('count') and (';COUNT=' +  str(datas.get('count'))) or '') +\
+        enddate = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '') +\
                              ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
 
-        rrule_string = 'FREQ=' + freq.upper() +  weekstring + ';INTERVAL=' + \
-                str(datas.get('interval')) + enddate + monthstring + yearstring
+        rrule_string = 'FREQ=' + freq.upper() + weekstring + interval_srting \
+                            + enddate + monthstring + yearstring
 
         return rrule_string
 
 
-    def search(self, cr, uid, args, offset=0, limit=100, order=None,
+    def search(self, cr, uid, args, offset=0, limit=100, order=None, 
             context=None, count=False):
         """
-        Overrides  orm search method.
+        Overrides orm search method.
         @param cr: the current row, from the database cursor,
         @param user: the current user’s ID for security checks,
         @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
@@ -1248,7 +1266,7 @@ class calendar_event(osv.osv):
 
     def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
         """
-        Overrides  orm browse method.
+        Overrides orm browse method.
         @param self: the object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1269,7 +1287,7 @@ class calendar_event(osv.osv):
 
     def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
         """
-        Overrides  orm Read method.Read List of fields for calendar event.
+        Overrides orm Read method.Read List of fields for calendar event.
         @param cr: the current row, from the database cursor,
         @param user: the current user’s ID for security checks,
         @param ids: List of calendar event's id.
@@ -1285,8 +1303,7 @@ class calendar_event(osv.osv):
         if fields and 'date' not in fields:
             fields.append('date')
         for base_calendar_id, real_id in select:
-            res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, \
-                                              load=load)
+            res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, load=load)
             ls = base_calendar_id2real_id(base_calendar_id, with_date=res.get('duration', 0))
             if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
                 res['date'] = ls[1]
@@ -1328,7 +1345,7 @@ class calendar_event(osv.osv):
                 for record in self.read(cr, uid, [base_calendar_id2real_id(id)], \
                                             ['date', 'rrule', 'exdate']):
                     if record['rrule']:
-                        exdate = (record['exdate'] and (record['exdate'] + ',')  or '') + ''.join((re.compile('\d')).findall(date_new)) + 'Z'
+                        exdate = (record['exdate'] and (record['exdate'] + ',') or '') + ''.join((re.compile('\d')).findall(date_new)) + 'Z'
                         if record['date'] == date_new:
                             res = self.write(cr, uid, [base_calendar_id2real_id(id)], {'exdate': exdate})
                     else:
@@ -1396,14 +1413,14 @@ class calendar_todo(osv.osv):
         """
 
         event = self.browse(cr, uid, id, context=context)
-        cr.execute("UPDATE %s set date_start='%s' where id=%s"  \
-                           % (self._table, value, id))
+        cr.execute("UPDATE %s set date_start='%s' where id=%s" \
+                            % (self._table, value, id))
         return True
 
     _columns = {
         'date': fields.function(_get_date, method=True, fnct_inv=_set_date, \
-                            string='Duration', store=True, type='datetime'),
-        'duration': fields.integer('Duration'),
+                            string='Duration', store=True, type='datetime'), 
+        'duration': fields.integer('Duration'), 
     }
 
     __attribute__ = {}
@@ -1429,7 +1446,7 @@ class ir_attachment(osv.osv):
             args1.append(map(lambda x:str(x).split('-')[0], arg))
         return super(ir_attachment, self).search_count(cr, user, args1, context)
 
-    def search(self, cr, uid, args, offset=0, limit=None, order=None,
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, 
             context=None, count=False):
         """ 
         @param self: The object pointer
@@ -1445,8 +1462,8 @@ class ir_attachment(osv.osv):
         for i, arg in enumerate(new_args):
             if arg[0] == 'res_id':
                 new_args[i] = (arg[0], arg[1], base_calendar_id2real_id(arg[2]))
-        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
-                            limit=limit, order=order,
+        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset, 
+                            limit=limit, order=order, 
                             context=context, count=False)
 ir_attachment()
 
@@ -1497,7 +1514,7 @@ class ir_model(osv.osv):
 
     _inherit = 'ir.model'
 
-    def read(self, cr, uid, ids, fields=None, context={},
+    def read(self, cr, uid, ids, fields=None, context={}, 
             load='_classic_read'):
         """ 
         Read IR Model
@@ -1557,7 +1574,7 @@ class res_users(osv.osv):
         res = {}
         attendee_obj = self.pool.get('calendar.attendee')
         attendee_ids = attendee_obj.search(cr, uid, [
-                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime),
+                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime), 
                     ('state', '=', 'accepted'), ('user_id', 'in', ids)
                     ])
 
@@ -1589,8 +1606,9 @@ class res_users(osv.osv):
     _columns = {
             'availability': fields.function(_get_user_avail_fun, type='selection', \
                     selection=[('free', 'Free'), ('busy', 'Busy')], \
-                    string='Free/Busy', method=True),
+                    string='Free/Busy', method=True), 
     }
 res_users()
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 0a60fa2e575..c54693ef866 100755
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invitation details">
-					<field name="email" string="Invitation To"/>
+                    <field name="email" string="Invitation To"/>
                     <field name="sent_by_uid" string="Invitation From" />
                     <notebook colspan="4">
                         <page string="Invitation">
@@ -70,7 +70,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Invitation details">
-					<field name="email" string="Invitation To"/>
+                    <field name="email" string="Invitation To"/>
                     <field name="partner_id" string="Partner" />
                     <field name="partner_address_id" string="Contact" />
                     <field name="role" />
@@ -136,7 +136,7 @@
                 </field>
             </record>
          <record id="action_res_alarm_view" model="ir.actions.act_window">
-			<field name="name">Available Alarms</field>
+            <field name="name">Available Alarms</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.alarm</field>
             <field name="view_type">form</field>
@@ -147,7 +147,8 @@
         <menuitem id="base.menu_calendar_configuration" name="Calendar"
             parent="base.menu_base_config" sequence="10" />
 
-        <menuitem name="Available Alarms" id="menu_crm_meeting_avail_alarm"
+        <menuitem id="menu_crm_meeting_avail_alarm"
+            groups="base.group_extended"
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" />
 
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
index d99e864a148..d17195f9a27 100755
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -35,7 +35,7 @@ class calendar_event_edit_all(osv.osv_memory):
         context_id = context and context.get('active_id', False) or False
         if context_id:
             if context.get('date'):
-                 return context.get('date')
+                return context.get('date')
             else:
                 model = context.get('model', False)
                 model_obj = self.pool.get(model)
diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__openerp__.py
similarity index 95%
rename from addons/base_contact/__terp__.py
rename to addons/base_contact/__openerp__.py
index af632e532b5..df9992b2ab8 100644
--- a/addons/base_contact/__terp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -47,7 +47,10 @@
         'base_contact_view.xml',
         'process/base_contact_process.xml'
     ],
-    'demo_xml': ['base_contact_demo.xml'],
+    'demo_xml': ['base_contact_demo.xml'], 
+    'test': [
+        'test/base_contact00.yml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '0031287885469',
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index d4fc8b2b007..9b4cc656acc 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -205,12 +205,12 @@ class res_partner_job(osv.osv):
                 self._order = 'sequence_contact'
 
                 contact_obj = self.pool.get('res.partner.contact')
-                search_arg = ['|', ('first_name', 'ilike', arg[2]), ('name', 'ilike', arg[2])]
-                contact_ids = contact_obj.search(cr, user, search_arg, offset=offset, \
-                                    limit=limit, order=order, context=context, count=count)
-                contacts = contact_obj.browse(cr, user, contact_ids, context=context)
-                for contact in contacts:
-                    job_ids.extend([item.id for item in contact.job_ids])
+                if arg[2] and not count:
+                    search_arg = ['|', ('first_name', 'ilike', arg[2]), ('name', 'ilike', arg[2])]
+                    contact_ids = contact_obj.search(cr, user, search_arg, offset=offset, limit=limit, order=order, context=context, count=count)
+                    contacts = contact_obj.browse(cr, user, contact_ids, context=context)
+                    for contact in contacts:
+                        job_ids.extend([item.id for item in contact.job_ids])
 
         res = super(res_partner_job,self).search(cr, user, args, offset=offset,\
                     limit=limit, order=order, context=context, count=count)
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index dbadbbaf6f3..49147fb2112 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -38,7 +38,7 @@
                        <group string="Partner" colspan="2" col="2">
                            <field name="partner_id" invisible="1" select="1"/>
                            <field name="title" select="1"/>
-                           <field name="function_id" invisible="1" select="2"/>
+                           <field name="function_id" invisible="1"/>
                         <field name="email"/>
                            <field name="lang_id"/>
                            <field name="active"/>
@@ -51,13 +51,13 @@
                        <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Functions and Addresses">
                                <group string="Partner" colspan="2" col="4">
-	                               <field name="function_id"/>
-	                               <field name="address_id" context="{'address_partner_id': name}"/>
-	                               <field name="name"/>
-	                               <field name="date_start" />
-	                               <field name="date_stop" />
-	                               <field name="state" />
-	                               <field name="sequence_contact" />
+                                   <field name="function_id"/>
+                                   <field name="address_id" context="{'address_partner_id': name}"/>
+                                   <field name="name"/>
+                                   <field name="date_start" />
+                                   <field name="date_stop" />
+                                   <field name="state" />
+                                   <field name="sequence_contact" />
                                </group>
                                <group string="Communication" colspan="2" col="2">
                                    <field name="phone"/>
@@ -135,13 +135,13 @@
                 <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1">
                     <form string="Address">
                        <group string="Postal Address" colspan="2" col="2">
-                           <field name="type" select="2" />
-                           <field name="street" select="2"/>
+                           <field name="type" />
+                           <field name="street"/>
                            <field name="street2"/>
-                           <field name="zip" select="2"/>
-                           <field name="city" select="2"/>
-                           <field name="country_id" select="2" completion="1"/>
-                           <field name="state_id" select="2"/>
+                           <field name="zip"/>
+                           <field name="city"/>
+                           <field name="country_id" completion="1"/>
+                           <field name="state_id"/>
                         </group>
                         <group string="Communication" colspan="2" col="2">
                            <field name="phone"/>
@@ -226,7 +226,7 @@
                 <notebook position="inside">
                     <page string="Categories">
                         <separator colspan="4" string="Categories"/>
-                        <field colspan="4" name="category_id" nolabel="1" select="2"/>
+                        <field colspan="4" name="category_id" nolabel="1"/>
                     </page>
                 </notebook>
             </field>
@@ -311,7 +311,7 @@
             <field name="partner_id" position="replace">
                 <field name='partner_id' select='1'/>
                 <field name='type' select='2'/>
-                <field name='job_id' invisible="1" select="2"/>
+                <field name='job_id' invisible="1"/>
             </field>
         </field>
     </record>
@@ -363,15 +363,15 @@
                         <field name="address_id" select="1" context="{'address_partner_id': name}"/>
                         <field name="contact_id" select="1"/>
                         <field name="function_id" select="1"/>
-                        <field name="email" select="2" widget="email"/>
-                        <field name="phone" select="2"/>
+                        <field name="email" widget="email"/>
+                        <field name="phone"/>
                         <field name="fax"/>
                         <field name="extension"/>
-                        <field name="sequence_contact" select="2" groups="base.group_user"/>
-                        <field name="sequence_partner" select="2" groups="base.group_user"/>
+                        <field name="sequence_contact" groups="base.group_user"/>
+                        <field name="sequence_partner" groups="base.group_user"/>
                         <field name="date_start" groups="base.group_user"/>
                         <field name="date_stop" groups="base.group_user"/>
-                        <field name="state" select="2" />
+                        <field name="state" />
                     </page>
                 </notebook>
             </form>
@@ -393,7 +393,7 @@
         src_model="res.partner"
         />
 
-	<!-- Act window defining a shorcut on partner address to open all his jobs -->
+    <!-- Act window defining a shorcut on partner address to open all his jobs -->
 
     <act_window
         id="act_res_partner_jobs" name="Open Jobs"
@@ -403,12 +403,12 @@
         />
 
     <menuitem icon="terp-purchase" id="base.menu_purchase_root"
-    	name="Procurement Management" sequence="7" />
+        name="Procurement Management" sequence="7" />
     <menuitem id="base.menu_procurement_management_supplier"
-    	name="Suppliers" parent="base.menu_purchase_root" sequence="3" />
+        name="Suppliers" parent="base.menu_purchase_root" sequence="3" />
     <menuitem name="Contacts" id="menu_partner_contact_supplier_form"
-    	action="action_partner_contact_form"
-    	parent="base.menu_procurement_management_supplier" sequence="2" />
+        action="action_partner_contact_form"
+        parent="base.menu_procurement_management_supplier" sequence="2" />
 
 </data>
 </openerp>
diff --git a/addons/base_contact/i18n/ar.po b/addons/base_contact/i18n/ar.po
index ef9bf53de26..d53b22781a8 100644
--- a/addons/base_contact/i18n/ar.po
+++ b/addons/base_contact/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/bg.po b/addons/base_contact/i18n/bg.po
index 134f79092f6..921569d6f5b 100644
--- a/addons/base_contact/i18n/bg.po
+++ b/addons/base_contact/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/bs.po b/addons/base_contact/i18n/bs.po
index caecefbf573..470eb2d579e 100644
--- a/addons/base_contact/i18n/bs.po
+++ b/addons/base_contact/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/ca.po b/addons/base_contact/i18n/ca.po
index 19966b0b23d..b46ab3d4f29 100644
--- a/addons/base_contact/i18n/ca.po
+++ b/addons/base_contact/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/cs.po b/addons/base_contact/i18n/cs.po
index 8b71fe80d7c..59cdcf7ec47 100644
--- a/addons/base_contact/i18n/cs.po
+++ b/addons/base_contact/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/de.po b/addons/base_contact/i18n/de.po
index 6523bc3fc26..92137785e1b 100644
--- a/addons/base_contact/i18n/de.po
+++ b/addons/base_contact/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/el.po b/addons/base_contact/i18n/el.po
index 6198c7c5070..7e034873e9f 100644
--- a/addons/base_contact/i18n/el.po
+++ b/addons/base_contact/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_contact/i18n/es.po b/addons/base_contact/i18n/es.po
index ae6c0535dc5..4090b1c9c1b 100644
--- a/addons/base_contact/i18n/es.po
+++ b/addons/base_contact/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/es_AR.po b/addons/base_contact/i18n/es_AR.po
index 8fa0295d884..b46cb04c076 100644
--- a/addons/base_contact/i18n/es_AR.po
+++ b/addons/base_contact/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/et.po b/addons/base_contact/i18n/et.po
index c971d1fb57b..23820feb339 100644
--- a/addons/base_contact/i18n/et.po
+++ b/addons/base_contact/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/fi.po b/addons/base_contact/i18n/fi.po
index f38013ee002..d21e16185b2 100644
--- a/addons/base_contact/i18n/fi.po
+++ b/addons/base_contact/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/fr.po b/addons/base_contact/i18n/fr.po
index c7f694ea9f9..3f230aae6ab 100644
--- a/addons/base_contact/i18n/fr.po
+++ b/addons/base_contact/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/hr.po b/addons/base_contact/i18n/hr.po
index 82d50f149ab..075652db0ab 100644
--- a/addons/base_contact/i18n/hr.po
+++ b/addons/base_contact/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -117,7 +117,7 @@ msgstr "Jezik"
 #. module: base_contact
 #: field:res.partner.job,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
diff --git a/addons/base_contact/i18n/hu.po b/addons/base_contact/i18n/hu.po
index 50b26f03fa2..0fa816e203b 100644
--- a/addons/base_contact/i18n/hu.po
+++ b/addons/base_contact/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/id.po b/addons/base_contact/i18n/id.po
index f44fa3384bc..8adb2960de4 100644
--- a/addons/base_contact/i18n/id.po
+++ b/addons/base_contact/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/it.po b/addons/base_contact/i18n/it.po
index 90776c07414..14e17c75716 100644
--- a/addons/base_contact/i18n/it.po
+++ b/addons/base_contact/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index 6089514cbc6..a5dbaad3f46 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 25bba1b7571..a0fb5839e8c 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/lv.po b/addons/base_contact/i18n/lv.po
index dea63f9824b..6f71715803c 100644
--- a/addons/base_contact/i18n/lv.po
+++ b/addons/base_contact/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po
index f8f3f8f2597..ed028b19326 100644
--- a/addons/base_contact/i18n/nl.po
+++ b/addons/base_contact/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/nl_BE.po b/addons/base_contact/i18n/nl_BE.po
index 3a5c520cdea..4fdfff89e85 100644
--- a/addons/base_contact/i18n/nl_BE.po
+++ b/addons/base_contact/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/pl.po b/addons/base_contact/i18n/pl.po
index c329d7278c2..37321024bdc 100644
--- a/addons/base_contact/i18n/pl.po
+++ b/addons/base_contact/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/pt.po b/addons/base_contact/i18n/pt.po
index c6dab1f3423..ae4726a1dd9 100644
--- a/addons/base_contact/i18n/pt.po
+++ b/addons/base_contact/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/pt_BR.po b/addons/base_contact/i18n/pt_BR.po
index edbf85fa620..ad77da22179 100644
--- a/addons/base_contact/i18n/pt_BR.po
+++ b/addons/base_contact/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/ro.po b/addons/base_contact/i18n/ro.po
index 1f7a4297bf4..c33683804a0 100644
--- a/addons/base_contact/i18n/ro.po
+++ b/addons/base_contact/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index bfc391d95ef..8081b98f7a4 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 13:34+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-13 07:22+0000\n"
+"Last-Translator: grisha <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-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -266,7 +266,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "Основной работодатель"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
@@ -286,7 +286,7 @@ msgstr "Контакт партнера"
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr ""
+msgstr "Контрагенты"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
diff --git a/addons/base_contact/i18n/sk.po b/addons/base_contact/i18n/sk.po
index a0d6b5879fa..d7de0c42066 100644
--- a/addons/base_contact/i18n/sk.po
+++ b/addons/base_contact/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/sl.po b/addons/base_contact/i18n/sl.po
index b9076d0946e..0a91884ea2b 100644
--- a/addons/base_contact/i18n/sl.po
+++ b/addons/base_contact/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/sq.po b/addons/base_contact/i18n/sq.po
index 6a1976747d3..0a3726d50d6 100644
--- a/addons/base_contact/i18n/sq.po
+++ b/addons/base_contact/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/sr.po b/addons/base_contact/i18n/sr.po
index 0ed86ccc62d..a2a780f53b4 100644
--- a/addons/base_contact/i18n/sr.po
+++ b/addons/base_contact/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/sv.po b/addons/base_contact/i18n/sv.po
index e537802666e..933d9b92dfa 100644
--- a/addons/base_contact/i18n/sv.po
+++ b/addons/base_contact/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/tlh.po b/addons/base_contact/i18n/tlh.po
index dcb16ca3582..14f902b335f 100644
--- a/addons/base_contact/i18n/tlh.po
+++ b/addons/base_contact/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index b9febf05c33..a3ce2ea74c4 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/uk.po b/addons/base_contact/i18n/uk.po
index 158ae0c0fce..59a0361af62 100644
--- a/addons/base_contact/i18n/uk.po
+++ b/addons/base_contact/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+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 c750ab300aa..7824f71f5c2 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -30,7 +30,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
+msgstr "对象名必须是以x_开头并且不能含有特殊字符"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
@@ -259,7 +259,7 @@ msgstr "联系人"
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr "您一起工作的公司。"
+msgstr "您工作的公司。"
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -321,12 +321,12 @@ msgstr "过去"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General Information"
-msgstr "常规信息"
+msgstr "通用信息"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr "相同业务伙伴地址的工作"
+msgstr "相同工作的业务伙伴地址"
 
 #. module: base_contact
 #: field:res.partner.job,name:0
diff --git a/addons/base_contact/i18n/zh_TW.po b/addons/base_contact/i18n/zh_TW.po
index fc21c875ba5..297c29f2d3f 100644
--- a/addons/base_contact/i18n/zh_TW.po
+++ b/addons/base_contact/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/test/base_contact00.yml b/addons/base_contact/test/base_contact00.yml
new file mode 100644
index 00000000000..a1b112e4e2a
--- /dev/null
+++ b/addons/base_contact/test/base_contact00.yml
@@ -0,0 +1,96 @@
+-  |
+   I will test base_contact for following cases:
+    *contacts unrelated to a partner,
+    *contacts working at several addresses (possibly for different partners),
+    *contacts with possibly different functions for each of its job's addresses
+-  |
+   In order to assign language to contacts first I will create Language FR
+   (Remove)
+- 
+    !record {model: res.lang, id: res_lang_french0}:
+      code: fr_BE
+      date_format: '%m/%d/%Y'
+      decimal_point: .
+      direction: ltr
+      grouping: '[]'
+      name: French
+      time_format: '%H:%M:%S'
+-  |
+   In order to check contacts first I will create contact unrelated to a partner
+- 
+    !record {model: res.partner.contact, id: res_partner_contact_williams0}:
+        country_id: base.be
+        first_name: Laura
+        job_ids:
+            - email: lwilliams@mydomain.com
+              function_id: base_contact.res_partner_function_privateaddress0
+              phone: (+32).10.45.18.77
+              sequence_contact: 1
+              state: current
+        lang_id: res_lang_french0
+        mobile: (+32).10.45.18.77
+        name: Williams
+        title: Mss
+-   |
+    Now in order to assign this contact to partner I will create one partner assign contact laura to this partner
+- 
+    !record {model: res.partner, id: res_partner_laurascompany0}:
+        address:
+            - city: Namur
+              country_id: base.be
+              phone: (+32).10.45.18.77
+              street: 23, street ways
+              type: default
+              zip: '2324324'
+              job_ids:
+                - address_id: res_partner_address_1
+                  function_id: base.function_director
+                  contact_id: res_partner_contact_williams0
+                  sequence_partner: 2
+                  state: current
+        lang: fr_BE
+        name: Laura's Company
+        ref: LC
+        title: ltd
+-   |
+    Now I will check that the new job is assigned properly to contact or not
+-
+    !assert {model: res.partner.contact, id: res_partner_contact_williams0}:
+        - len(job_ids) > 2
+-   |
+    In order to check contacts working at several addresses for different partners
+    I will create contact with 2 different addresses
+- 
+  !record {model: res.partner.contact, id: res_partner_contact_pauwels0}:
+        country_id: base.be
+        first_name: Nicolas
+        job_ids:
+          - address_id: base.main_address
+            function_id: base.function_it
+            state: current
+          - address_id: base.res_partner_address_3000
+            function_id: base.function_director
+            state: current
+        lang_id: res_lang_french0
+        mobile: (+32).23.44.32.12
+        name: Pauwels
+        title: M.
+-   |
+    In order to check one contact working at one partner with different functions
+    I will create contact with 2 different jobs with different function but the same address
+- 
+  !record {model: res.partner.contact, id: res_partner_contact_mortier0}:
+    country_id: base.be
+    first_name: Christina
+    job_ids:
+      - address_id: base.res_partner_address_1
+        function_id: base.function_director
+        state: past
+      - address_id: base.res_partner_address_1
+        function_id: base.function_it
+        state: current
+    lang_id: base_contact.res_lang_french0
+    mobile: (+32).10.45.18.77
+    name: Mortier
+    title: Mss
+
diff --git a/addons/base_iban/__terp__.py b/addons/base_iban/__openerp__.py
similarity index 100%
rename from addons/base_iban/__terp__.py
rename to addons/base_iban/__openerp__.py
diff --git a/addons/base_iban/i18n/ar.po b/addons/base_iban/i18n/ar.po
index 84d2b44b366..02e12a9dfd8 100644
--- a/addons/base_iban/i18n/ar.po
+++ b/addons/base_iban/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/bg.po b/addons/base_iban/i18n/bg.po
index 2f3528a7593..dc2c105ccab 100644
--- a/addons/base_iban/i18n/bg.po
+++ b/addons/base_iban/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/bs.po b/addons/base_iban/i18n/bs.po
index 8bdc4c3dca1..e663f023e89 100644
--- a/addons/base_iban/i18n/bs.po
+++ b/addons/base_iban/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/ca.po b/addons/base_iban/i18n/ca.po
index 6bac5036f94..c3602c41210 100644
--- a/addons/base_iban/i18n/ca.po
+++ b/addons/base_iban/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/cs.po b/addons/base_iban/i18n/cs.po
index 626d9d25eff..8bf9f0f1617 100644
--- a/addons/base_iban/i18n/cs.po
+++ b/addons/base_iban/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/de.po b/addons/base_iban/i18n/de.po
index 71500a68e0a..60385db0fc6 100644
--- a/addons/base_iban/i18n/de.po
+++ b/addons/base_iban/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/el.po b/addons/base_iban/i18n/el.po
index b676235b731..4725aca86f6 100644
--- a/addons/base_iban/i18n/el.po
+++ b/addons/base_iban/i18n/el.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_iban/i18n/es.po b/addons/base_iban/i18n/es.po
index 33dd52d9188..3bcd94e6ac4 100644
--- a/addons/base_iban/i18n/es.po
+++ b/addons/base_iban/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/es_AR.po b/addons/base_iban/i18n/es_AR.po
index f8e01dd0e52..fe3f75a022f 100644
--- a/addons/base_iban/i18n/es_AR.po
+++ b/addons/base_iban/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/et.po b/addons/base_iban/i18n/et.po
index 1f8f95f4e1c..05a3a6d3d87 100644
--- a/addons/base_iban/i18n/et.po
+++ b/addons/base_iban/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/fi.po b/addons/base_iban/i18n/fi.po
index f5e5e32d41b..f999a9fc272 100644
--- a/addons/base_iban/i18n/fi.po
+++ b/addons/base_iban/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/fr.po b/addons/base_iban/i18n/fr.po
index 033a0d11f0c..087332f34f0 100644
--- a/addons/base_iban/i18n/fr.po
+++ b/addons/base_iban/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/gl.po b/addons/base_iban/i18n/gl.po
index ff03bb32a74..186536bf166 100644
--- a/addons/base_iban/i18n/gl.po
+++ b/addons/base_iban/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/hr.po b/addons/base_iban/i18n/hr.po
index f5590e76c6b..e222a6e6443 100644
--- a/addons/base_iban/i18n/hr.po
+++ b/addons/base_iban/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/base_iban/i18n/hu.po b/addons/base_iban/i18n/hu.po
index 84d2b44b366..02e12a9dfd8 100644
--- a/addons/base_iban/i18n/hu.po
+++ b/addons/base_iban/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/id.po b/addons/base_iban/i18n/id.po
index 76ceb696d6c..64db6e41fa1 100644
--- a/addons/base_iban/i18n/id.po
+++ b/addons/base_iban/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/it.po b/addons/base_iban/i18n/it.po
index eeb94310200..624ed68ec27 100644
--- a/addons/base_iban/i18n/it.po
+++ b/addons/base_iban/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/ko.po b/addons/base_iban/i18n/ko.po
index b6d7ec6da43..c0f8928e4fc 100644
--- a/addons/base_iban/i18n/ko.po
+++ b/addons/base_iban/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/lt.po b/addons/base_iban/i18n/lt.po
index 94dc6114b2b..cfc6a5f9ea4 100644
--- a/addons/base_iban/i18n/lt.po
+++ b/addons/base_iban/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/lv.po b/addons/base_iban/i18n/lv.po
index 2d6b963df26..e527d6f2122 100644
--- a/addons/base_iban/i18n/lv.po
+++ b/addons/base_iban/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/nl.po b/addons/base_iban/i18n/nl.po
index f4e0f8657b7..6113ff0b080 100644
--- a/addons/base_iban/i18n/nl.po
+++ b/addons/base_iban/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/nl_BE.po b/addons/base_iban/i18n/nl_BE.po
index 220ce1185cd..5161c6b93d9 100644
--- a/addons/base_iban/i18n/nl_BE.po
+++ b/addons/base_iban/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/pl.po b/addons/base_iban/i18n/pl.po
index 9e2da727237..f0be5dbb635 100644
--- a/addons/base_iban/i18n/pl.po
+++ b/addons/base_iban/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/pt.po b/addons/base_iban/i18n/pt.po
index e3598cc3605..bccc6c861cd 100644
--- a/addons/base_iban/i18n/pt.po
+++ b/addons/base_iban/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/pt_BR.po b/addons/base_iban/i18n/pt_BR.po
index e69ed2f200a..9f6e1792434 100644
--- a/addons/base_iban/i18n/pt_BR.po
+++ b/addons/base_iban/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/ro.po b/addons/base_iban/i18n/ro.po
index 5c73a3532af..15a63165344 100644
--- a/addons/base_iban/i18n/ro.po
+++ b/addons/base_iban/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/ru.po b/addons/base_iban/i18n/ru.po
index 11b626d63e7..9a0aa3fe39d 100644
--- a/addons/base_iban/i18n/ru.po
+++ b/addons/base_iban/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sk.po b/addons/base_iban/i18n/sk.po
index a6015eacda5..6990cd6a2a4 100644
--- a/addons/base_iban/i18n/sk.po
+++ b/addons/base_iban/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sl.po b/addons/base_iban/i18n/sl.po
index b652cf021d7..902121e0ca1 100644
--- a/addons/base_iban/i18n/sl.po
+++ b/addons/base_iban/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sq.po b/addons/base_iban/i18n/sq.po
index a20cc6fba58..1c664fb2877 100644
--- a/addons/base_iban/i18n/sq.po
+++ b/addons/base_iban/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po
index 21e583f03b0..1e09b414d10 100644
--- a/addons/base_iban/i18n/sr.po
+++ b/addons/base_iban/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sv.po b/addons/base_iban/i18n/sv.po
index 0d90ca0127f..344163a3846 100644
--- a/addons/base_iban/i18n/sv.po
+++ b/addons/base_iban/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/tlh.po b/addons/base_iban/i18n/tlh.po
index aa3a1d3026e..813fefcd09b 100644
--- a/addons/base_iban/i18n/tlh.po
+++ b/addons/base_iban/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index ca27bc94fdd..6859360e68a 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/uk.po b/addons/base_iban/i18n/uk.po
index b78afe279bf..b70a6193ec1 100644
--- a/addons/base_iban/i18n/uk.po
+++ b/addons/base_iban/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/zh_CN.po b/addons/base_iban/i18n/zh_CN.po
index 159cb9d26e0..6a808f64355 100644
--- a/addons/base_iban/i18n/zh_CN.po
+++ b/addons/base_iban/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/zh_TW.po b/addons/base_iban/i18n/zh_TW.po
index 7e99ffe8d07..724094faf06 100644
--- a/addons/base_iban/i18n/zh_TW.po
+++ b/addons/base_iban/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_module_merge/i18n/ar.po b/addons/base_module_merge/i18n/ar.po
index 3c59125355a..a84d4019d3d 100644
--- a/addons/base_module_merge/i18n/ar.po
+++ b/addons/base_module_merge/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/bg.po b/addons/base_module_merge/i18n/bg.po
index 3c59125355a..a84d4019d3d 100644
--- a/addons/base_module_merge/i18n/bg.po
+++ b/addons/base_module_merge/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/bs.po b/addons/base_module_merge/i18n/bs.po
index 3c59125355a..a84d4019d3d 100644
--- a/addons/base_module_merge/i18n/bs.po
+++ b/addons/base_module_merge/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/ca.po b/addons/base_module_merge/i18n/ca.po
index 3a6ddcff6a5..5d12efe9b34 100644
--- a/addons/base_module_merge/i18n/ca.po
+++ b/addons/base_module_merge/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/cs.po b/addons/base_module_merge/i18n/cs.po
index 3c59125355a..a84d4019d3d 100644
--- a/addons/base_module_merge/i18n/cs.po
+++ b/addons/base_module_merge/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/de.po b/addons/base_module_merge/i18n/de.po
index c1e4b0eb805..fddb4fc4adc 100644
--- a/addons/base_module_merge/i18n/de.po
+++ b/addons/base_module_merge/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/el.po b/addons/base_module_merge/i18n/el.po
index e1b6e5bcdba..f56ea0e8916 100644
--- a/addons/base_module_merge/i18n/el.po
+++ b/addons/base_module_merge/i18n/el.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_module_merge/i18n/es.po b/addons/base_module_merge/i18n/es.po
index 8894863af77..6563beadd44 100644
--- a/addons/base_module_merge/i18n/es.po
+++ b/addons/base_module_merge/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/es_AR.po b/addons/base_module_merge/i18n/es_AR.po
index c91dab2b3bf..f4e82576b3c 100644
--- a/addons/base_module_merge/i18n/es_AR.po
+++ b/addons/base_module_merge/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/es_EC.po b/addons/base_module_merge/i18n/es_EC.po
index cbb09a1d4c8..e87c4d4bdce 100644
--- a/addons/base_module_merge/i18n/es_EC.po
+++ b/addons/base_module_merge/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/et.po b/addons/base_module_merge/i18n/et.po
index 2d6a5c0c6af..73fa2f2878a 100644
--- a/addons/base_module_merge/i18n/et.po
+++ b/addons/base_module_merge/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/fi.po b/addons/base_module_merge/i18n/fi.po
index 4dec1ed5149..0db42ae359d 100644
--- a/addons/base_module_merge/i18n/fi.po
+++ b/addons/base_module_merge/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/fr.po b/addons/base_module_merge/i18n/fr.po
index b1fff30df68..4fdd4b91b1f 100644
--- a/addons/base_module_merge/i18n/fr.po
+++ b/addons/base_module_merge/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/gl.po b/addons/base_module_merge/i18n/gl.po
index 70eb7a0907d..8c2b1150c68 100644
--- a/addons/base_module_merge/i18n/gl.po
+++ b/addons/base_module_merge/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/hr.po b/addons/base_module_merge/i18n/hr.po
index cae2bd1c026..0607947afd6 100644
--- a/addons/base_module_merge/i18n/hr.po
+++ b/addons/base_module_merge/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/base_module_merge/i18n/hu.po b/addons/base_module_merge/i18n/hu.po
index 3c59125355a..a84d4019d3d 100644
--- a/addons/base_module_merge/i18n/hu.po
+++ b/addons/base_module_merge/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/id.po b/addons/base_module_merge/i18n/id.po
index 0d3070464e2..6d0a9cedee3 100644
--- a/addons/base_module_merge/i18n/id.po
+++ b/addons/base_module_merge/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/it.po b/addons/base_module_merge/i18n/it.po
index 81f420e5ab1..6b840558b35 100644
--- a/addons/base_module_merge/i18n/it.po
+++ b/addons/base_module_merge/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/ko.po b/addons/base_module_merge/i18n/ko.po
index 6e3031ccc4f..cdd35a2fcfd 100644
--- a/addons/base_module_merge/i18n/ko.po
+++ b/addons/base_module_merge/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/lt.po b/addons/base_module_merge/i18n/lt.po
index 78182f690e9..5132cdbeb4a 100644
--- a/addons/base_module_merge/i18n/lt.po
+++ b/addons/base_module_merge/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/nl.po b/addons/base_module_merge/i18n/nl.po
index ff604dabaf1..abe4ecaf0bf 100644
--- a/addons/base_module_merge/i18n/nl.po
+++ b/addons/base_module_merge/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/pl.po b/addons/base_module_merge/i18n/pl.po
index 56d73a016a4..7b01342b798 100644
--- a/addons/base_module_merge/i18n/pl.po
+++ b/addons/base_module_merge/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/pt.po b/addons/base_module_merge/i18n/pt.po
index d2cc1c21fed..49118cb455b 100644
--- a/addons/base_module_merge/i18n/pt.po
+++ b/addons/base_module_merge/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/pt_BR.po b/addons/base_module_merge/i18n/pt_BR.po
index 75cf564bd79..25cc8cae7df 100644
--- a/addons/base_module_merge/i18n/pt_BR.po
+++ b/addons/base_module_merge/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/ro.po b/addons/base_module_merge/i18n/ro.po
index fc3cdd73e1b..95ec3a989e7 100644
--- a/addons/base_module_merge/i18n/ro.po
+++ b/addons/base_module_merge/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/ru.po b/addons/base_module_merge/i18n/ru.po
index 5b6b2e8f1b8..e47a7b00e10 100644
--- a/addons/base_module_merge/i18n/ru.po
+++ b/addons/base_module_merge/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-03 23:27+0000\n"
-"Last-Translator: Artyom Packhomov <Unknown>\n"
+"PO-Revision-Date: 2010-04-16 13:25+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
@@ -81,7 +81,7 @@ msgstr "Название модуля"
 #: model:ir.actions.wizard,name:base_module_merge.wizard_base_module_merger
 #: model:ir.ui.menu,name:base_module_merge.menu_wizard_base_module_merger
 msgid "Merge module"
-msgstr ""
+msgstr "Слияние модуля"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,save,module_file:0
@@ -117,7 +117,7 @@ msgstr "Далее"
 #. module: base_module_merge
 #: selection:base_module_merge.module_merge,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+msgstr "Нормализованные данные"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
@@ -126,6 +126,10 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
+"Если Вы считаете, что Ваш модуль может быть интересен другим людям, мы "
+"советуем Вам опубликовать его на OpenERP.com в разделе 'Modules'. Вы можете "
+"сделать это через сайт или используя возможности из модуля "
+"'base_module_publish'."
 
 #. module: base_module_merge
 #: help:base_module_merge.module_merge,init,modules_list:0
diff --git a/addons/base_module_merge/i18n/sk.po b/addons/base_module_merge/i18n/sk.po
index 096006e3020..4986894ee78 100644
--- a/addons/base_module_merge/i18n/sk.po
+++ b/addons/base_module_merge/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/sl.po b/addons/base_module_merge/i18n/sl.po
index 3b0b9bd5716..774cf061e48 100644
--- a/addons/base_module_merge/i18n/sl.po
+++ b/addons/base_module_merge/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/sq.po b/addons/base_module_merge/i18n/sq.po
index 6c4443fd4f7..09337fab86c 100644
--- a/addons/base_module_merge/i18n/sq.po
+++ b/addons/base_module_merge/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/sv.po b/addons/base_module_merge/i18n/sv.po
index 3c59125355a..a84d4019d3d 100644
--- a/addons/base_module_merge/i18n/sv.po
+++ b/addons/base_module_merge/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/tlh.po b/addons/base_module_merge/i18n/tlh.po
index c79648bb029..51fd900a6b9 100644
--- a/addons/base_module_merge/i18n/tlh.po
+++ b/addons/base_module_merge/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/tr.po b/addons/base_module_merge/i18n/tr.po
index 9c163b3734d..d13bcb70639 100644
--- a/addons/base_module_merge/i18n/tr.po
+++ b/addons/base_module_merge/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/uk.po b/addons/base_module_merge/i18n/uk.po
index e37067dead7..41dedb1b806 100644
--- a/addons/base_module_merge/i18n/uk.po
+++ b/addons/base_module_merge/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/vi.po b/addons/base_module_merge/i18n/vi.po
index 4836f9310e4..6e03b3b54a4 100644
--- a/addons/base_module_merge/i18n/vi.po
+++ b/addons/base_module_merge/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/zh_CN.po b/addons/base_module_merge/i18n/zh_CN.po
index 576594b37f5..e62964c9298 100644
--- a/addons/base_module_merge/i18n/zh_CN.po
+++ b/addons/base_module_merge/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_merge/i18n/zh_TW.po b/addons/base_module_merge/i18n/zh_TW.po
index 374a9c4b820..05387c254bf 100644
--- a/addons/base_module_merge/i18n/zh_TW.po
+++ b/addons/base_module_merge/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
diff --git a/addons/base_module_publish/i18n/ar.po b/addons/base_module_publish/i18n/ar.po
index 13c488dc82b..d644c48a940 100644
--- a/addons/base_module_publish/i18n/ar.po
+++ b/addons/base_module_publish/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/bg.po b/addons/base_module_publish/i18n/bg.po
index a505fd797c2..5c0f6db418f 100644
--- a/addons/base_module_publish/i18n/bg.po
+++ b/addons/base_module_publish/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/bs.po b/addons/base_module_publish/i18n/bs.po
index 0b7a88161ab..bb71f4a2544 100644
--- a/addons/base_module_publish/i18n/bs.po
+++ b/addons/base_module_publish/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/ca.po b/addons/base_module_publish/i18n/ca.po
index f3b71468dae..b354014877d 100644
--- a/addons/base_module_publish/i18n/ca.po
+++ b/addons/base_module_publish/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/cs.po b/addons/base_module_publish/i18n/cs.po
index fb5860c0988..5fe6f374b9d 100644
--- a/addons/base_module_publish/i18n/cs.po
+++ b/addons/base_module_publish/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/de.po b/addons/base_module_publish/i18n/de.po
index 83a1ffc0717..0322f621b9f 100644
--- a/addons/base_module_publish/i18n/de.po
+++ b/addons/base_module_publish/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/el.po b/addons/base_module_publish/i18n/el.po
index b6656af281c..8b4ead2d403 100644
--- a/addons/base_module_publish/i18n/el.po
+++ b/addons/base_module_publish/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_module_publish/i18n/es.po b/addons/base_module_publish/i18n/es.po
index d04c27b7d0b..ed225675fa5 100644
--- a/addons/base_module_publish/i18n/es.po
+++ b/addons/base_module_publish/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/es_AR.po b/addons/base_module_publish/i18n/es_AR.po
index b8e2e36d9b5..95719870de2 100644
--- a/addons/base_module_publish/i18n/es_AR.po
+++ b/addons/base_module_publish/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/et.po b/addons/base_module_publish/i18n/et.po
index 2c8b981d04f..fbc61c2ea67 100644
--- a/addons/base_module_publish/i18n/et.po
+++ b/addons/base_module_publish/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/fi.po b/addons/base_module_publish/i18n/fi.po
index ce24cba77e0..c6cff15b2ad 100644
--- a/addons/base_module_publish/i18n/fi.po
+++ b/addons/base_module_publish/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/fr.po b/addons/base_module_publish/i18n/fr.po
index 395202eeb6e..bd8cd144562 100644
--- a/addons/base_module_publish/i18n/fr.po
+++ b/addons/base_module_publish/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/hr.po b/addons/base_module_publish/i18n/hr.po
index 3bd4d77a30b..a53f6fca873 100644
--- a/addons/base_module_publish/i18n/hr.po
+++ b/addons/base_module_publish/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/hu.po b/addons/base_module_publish/i18n/hu.po
index 13c488dc82b..d644c48a940 100644
--- a/addons/base_module_publish/i18n/hu.po
+++ b/addons/base_module_publish/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/id.po b/addons/base_module_publish/i18n/id.po
index 5dcdb1c3217..08050de1dba 100644
--- a/addons/base_module_publish/i18n/id.po
+++ b/addons/base_module_publish/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/it.po b/addons/base_module_publish/i18n/it.po
index 6c876d5fd1c..1377ec9bec4 100644
--- a/addons/base_module_publish/i18n/it.po
+++ b/addons/base_module_publish/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/ko.po b/addons/base_module_publish/i18n/ko.po
index f0c78a6bd5c..dab862433c9 100644
--- a/addons/base_module_publish/i18n/ko.po
+++ b/addons/base_module_publish/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/lt.po b/addons/base_module_publish/i18n/lt.po
index 13c488dc82b..d644c48a940 100644
--- a/addons/base_module_publish/i18n/lt.po
+++ b/addons/base_module_publish/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/nl.po b/addons/base_module_publish/i18n/nl.po
index 91deb97129c..33448c844a1 100644
--- a/addons/base_module_publish/i18n/nl.po
+++ b/addons/base_module_publish/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/nl_BE.po b/addons/base_module_publish/i18n/nl_BE.po
index 25ed0b29a43..115e40c5245 100644
--- a/addons/base_module_publish/i18n/nl_BE.po
+++ b/addons/base_module_publish/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/pl.po b/addons/base_module_publish/i18n/pl.po
index 8271cc6a94c..bf95f292bc5 100644
--- a/addons/base_module_publish/i18n/pl.po
+++ b/addons/base_module_publish/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/pt.po b/addons/base_module_publish/i18n/pt.po
index 03e09643b2a..659f44b096c 100644
--- a/addons/base_module_publish/i18n/pt.po
+++ b/addons/base_module_publish/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/pt_BR.po b/addons/base_module_publish/i18n/pt_BR.po
index d412e7feda0..d06bc8d21a0 100644
--- a/addons/base_module_publish/i18n/pt_BR.po
+++ b/addons/base_module_publish/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/ro.po b/addons/base_module_publish/i18n/ro.po
index 0fe712435a7..3b41ebd6127 100644
--- a/addons/base_module_publish/i18n/ro.po
+++ b/addons/base_module_publish/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/ru.po b/addons/base_module_publish/i18n/ru.po
index 9b3c1c8602f..c032b5ea044 100644
--- a/addons/base_module_publish/i18n/ru.po
+++ b/addons/base_module_publish/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-29 06:18+0000\n"
-"Last-Translator: Alexey Rusaleev <alexey.rusaleev@mail.ru>\n"
+"PO-Revision-Date: 2010-04-16 13:28+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
@@ -62,7 +62,7 @@ msgstr "Имя файла"
 #. module: base_module_publish
 #: model:ir.module.module,shortdesc:base_module_publish.module_meta_information
 msgid "Module publisher"
-msgstr ""
+msgstr "Издатель модуля"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,demourl:0
@@ -77,12 +77,12 @@ msgstr "Версия"
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,license:0
 msgid "Other proprietary"
-msgstr ""
+msgstr "Другой проприетарный"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_export,init,include_src:0
 msgid "Include sources"
-msgstr ""
+msgstr "Включить источники"
 
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,operation:0
@@ -92,7 +92,7 @@ msgstr "Модификация"
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,demourl:0
 msgid "empty to keep existing value"
-msgstr ""
+msgstr "оставьте пустым, чтобы не менять нынешнее значение"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step2,email:0
@@ -103,7 +103,7 @@ msgstr "Эл. почта"
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,url_download:0
 msgid "Keep empty for an auto upload of the module"
-msgstr ""
+msgstr "Оставьте пустым чтобы автоматически закачать модуль"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,website:0
@@ -132,6 +132,7 @@ msgstr "Описание"
 msgid ""
 "If you don't have an access, you can create one http://www.openerp.com/"
 msgstr ""
+"Если у вас нет доступа, вы можете его создать http://www.openerp.com/"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,init:0
@@ -212,7 +213,7 @@ msgstr "Ссылка на документацию"
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,image:0
 msgid "support only .png files"
-msgstr ""
+msgstr "поддерживает только файлы .png"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,publish,text_end:0
@@ -234,13 +235,13 @@ msgstr "Модули уже обновлены"
 #: wizard_view:base_module_publish.module_export,init:0
 #: model:ir.actions.wizard,name:base_module_publish.wizard_base_module_export
 msgid "Export module"
-msgstr ""
+msgstr "Экспортировать модуль"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,step2:0
 #: wizard_view:base_module_publish.module_publish_all,login:0
 msgid "Please provide here your login on the Open ERP website."
-msgstr ""
+msgstr "Пожалуйста, введите тут ваш логин для доступа к сайту  Open ERP."
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step2,login:0
@@ -251,7 +252,7 @@ msgstr "Учетная запись"
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,license:0
 msgid "GPL-2"
-msgstr ""
+msgstr "GPL-2"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish_all,publish:0
@@ -266,7 +267,7 @@ msgstr "Модуль успешно экспортирован!"
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,operation:0
 msgid "Creation"
-msgstr ""
+msgstr "Создание"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,include_src:0
@@ -312,7 +313,7 @@ msgstr "Действие"
 #. module: base_module_publish
 #: help:base_module_publish.module_publish,step1,docurl:0
 msgid "Empty to keep existing value"
-msgstr ""
+msgstr "Оставьте пустым, чтобы не менять нынешнее значение"
 
 #. module: base_module_publish
 #: model:ir.actions.wizard,name:base_module_publish.wizard_base_module_publish
diff --git a/addons/base_module_publish/i18n/sl.po b/addons/base_module_publish/i18n/sl.po
index 77890d4beef..0aa67f921cd 100644
--- a/addons/base_module_publish/i18n/sl.po
+++ b/addons/base_module_publish/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/sr.po b/addons/base_module_publish/i18n/sr.po
index a4e6e56f453..30626d9b753 100644
--- a/addons/base_module_publish/i18n/sr.po
+++ b/addons/base_module_publish/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/sv.po b/addons/base_module_publish/i18n/sv.po
index 13c488dc82b..d644c48a940 100644
--- a/addons/base_module_publish/i18n/sv.po
+++ b/addons/base_module_publish/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/tlh.po b/addons/base_module_publish/i18n/tlh.po
index ff477104345..9b135002067 100644
--- a/addons/base_module_publish/i18n/tlh.po
+++ b/addons/base_module_publish/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/tr.po b/addons/base_module_publish/i18n/tr.po
index 30f66a5c78a..b41aebe0d8d 100644
--- a/addons/base_module_publish/i18n/tr.po
+++ b/addons/base_module_publish/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/uk.po b/addons/base_module_publish/i18n/uk.po
index 79705d6c962..d06e9607273 100644
--- a/addons/base_module_publish/i18n/uk.po
+++ b/addons/base_module_publish/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/zh_CN.po b/addons/base_module_publish/i18n/zh_CN.po
index 5df023d5eee..ee4ea600c34 100644
--- a/addons/base_module_publish/i18n/zh_CN.po
+++ b/addons/base_module_publish/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_publish/i18n/zh_TW.po b/addons/base_module_publish/i18n/zh_TW.po
index eaa470e88a0..bb4e916defd 100644
--- a/addons/base_module_publish/i18n/zh_TW.po
+++ b/addons/base_module_publish/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
diff --git a/addons/base_module_quality/__terp__.py b/addons/base_module_quality/__openerp__.py
similarity index 100%
rename from addons/base_module_quality/__terp__.py
rename to addons/base_module_quality/__openerp__.py
diff --git a/addons/base_module_quality/i18n/ab.po b/addons/base_module_quality/i18n/ab.po
index d0d78b3aa59..ba35de3c7b9 100644
--- a/addons/base_module_quality/i18n/ab.po
+++ b/addons/base_module_quality/i18n/ab.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ar.po b/addons/base_module_quality/i18n/ar.po
index 51d35d85736..c03dbd15734 100644
--- a/addons/base_module_quality/i18n/ar.po
+++ b/addons/base_module_quality/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/bg.po b/addons/base_module_quality/i18n/bg.po
index 4ade4707c00..dc2a03cfe15 100644
--- a/addons/base_module_quality/i18n/bg.po
+++ b/addons/base_module_quality/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/bs.po b/addons/base_module_quality/i18n/bs.po
index af85e64ddf2..869dda992f0 100644
--- a/addons/base_module_quality/i18n/bs.po
+++ b/addons/base_module_quality/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ca.po b/addons/base_module_quality/i18n/ca.po
index 1850e933ecc..04003735305 100644
--- a/addons/base_module_quality/i18n/ca.po
+++ b/addons/base_module_quality/i18n/ca.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/cs.po b/addons/base_module_quality/i18n/cs.po
index f11fde5ca6c..a1a1416fcd5 100644
--- a/addons/base_module_quality/i18n/cs.po
+++ b/addons/base_module_quality/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/de.po b/addons/base_module_quality/i18n/de.po
index 7b23ad779e2..386afa8c627 100644
--- a/addons/base_module_quality/i18n/de.po
+++ b/addons/base_module_quality/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/es.po b/addons/base_module_quality/i18n/es.po
index aec07bc9336..d7f1ab4e6fd 100644
--- a/addons/base_module_quality/i18n/es.po
+++ b/addons/base_module_quality/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/es_AR.po b/addons/base_module_quality/i18n/es_AR.po
index 0b584e0d8df..faff05e7510 100644
--- a/addons/base_module_quality/i18n/es_AR.po
+++ b/addons/base_module_quality/i18n/es_AR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/es_EC.po b/addons/base_module_quality/i18n/es_EC.po
index 8f9a289d2e0..2dc36927c5d 100644
--- a/addons/base_module_quality/i18n/es_EC.po
+++ b/addons/base_module_quality/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/et.po b/addons/base_module_quality/i18n/et.po
index cb2a9e32e3a..bdaff69d207 100644
--- a/addons/base_module_quality/i18n/et.po
+++ b/addons/base_module_quality/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/fi.po b/addons/base_module_quality/i18n/fi.po
index 00e85c4a111..f0ea5efff5f 100644
--- a/addons/base_module_quality/i18n/fi.po
+++ b/addons/base_module_quality/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/fr.po b/addons/base_module_quality/i18n/fr.po
index d08be52da37..7929e8047bc 100644
--- a/addons/base_module_quality/i18n/fr.po
+++ b/addons/base_module_quality/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/gl.po b/addons/base_module_quality/i18n/gl.po
index ce25a03e177..af57f18a766 100644
--- a/addons/base_module_quality/i18n/gl.po
+++ b/addons/base_module_quality/i18n/gl.po
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/hr.po b/addons/base_module_quality/i18n/hr.po
index 8a5b6fc5d77..46116a9795a 100644
--- a/addons/base_module_quality/i18n/hr.po
+++ b/addons/base_module_quality/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/base_module_quality/i18n/hu.po b/addons/base_module_quality/i18n/hu.po
index 9510f8fb6b1..59c6a69b78f 100644
--- a/addons/base_module_quality/i18n/hu.po
+++ b/addons/base_module_quality/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 3dbe761e96b..9a4838ace97 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -9,12 +9,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-04-09 18:42+0000\n"
-"Last-Translator: Frankenstein <Unknown>\n"
+"Last-Translator: Nicola Pedron <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-04-10 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/iu.po b/addons/base_module_quality/i18n/iu.po
index 32effc8262b..915e9fa5b28 100644
--- a/addons/base_module_quality/i18n/iu.po
+++ b/addons/base_module_quality/i18n/iu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ko.po b/addons/base_module_quality/i18n/ko.po
index 52656467b5c..067eb3e4664 100644
--- a/addons/base_module_quality/i18n/ko.po
+++ b/addons/base_module_quality/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/lt.po b/addons/base_module_quality/i18n/lt.po
index 06364a7a12a..b48ade25352 100644
--- a/addons/base_module_quality/i18n/lt.po
+++ b/addons/base_module_quality/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/nl.po b/addons/base_module_quality/i18n/nl.po
index a993cb544df..c392e6920f7 100644
--- a/addons/base_module_quality/i18n/nl.po
+++ b/addons/base_module_quality/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/pl.po b/addons/base_module_quality/i18n/pl.po
index 9f044562a9a..599118e83dc 100644
--- a/addons/base_module_quality/i18n/pl.po
+++ b/addons/base_module_quality/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/pt.po b/addons/base_module_quality/i18n/pt.po
index 9c8708516b7..bdfd740ece7 100644
--- a/addons/base_module_quality/i18n/pt.po
+++ b/addons/base_module_quality/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/pt_BR.po b/addons/base_module_quality/i18n/pt_BR.po
index c8088bdd790..3aa9edaabb0 100644
--- a/addons/base_module_quality/i18n/pt_BR.po
+++ b/addons/base_module_quality/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ro.po b/addons/base_module_quality/i18n/ro.po
index b88f83bce74..b24a6da2ac0 100644
--- a/addons/base_module_quality/i18n/ro.po
+++ b/addons/base_module_quality/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ru.po b/addons/base_module_quality/i18n/ru.po
index 6c9a23d4eae..697afdbc70b 100644
--- a/addons/base_module_quality/i18n/ru.po
+++ b/addons/base_module_quality/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sk.po b/addons/base_module_quality/i18n/sk.po
index 901238a264a..a67b9bbff25 100644
--- a/addons/base_module_quality/i18n/sk.po
+++ b/addons/base_module_quality/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sl.po b/addons/base_module_quality/i18n/sl.po
index dc56723da6b..d09bb847b5f 100644
--- a/addons/base_module_quality/i18n/sl.po
+++ b/addons/base_module_quality/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sr.po b/addons/base_module_quality/i18n/sr.po
index 37f739a8dd3..9f644427598 100644
--- a/addons/base_module_quality/i18n/sr.po
+++ b/addons/base_module_quality/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sv.po b/addons/base_module_quality/i18n/sv.po
index e89f4cd6ac1..53c4f35ea1a 100644
--- a/addons/base_module_quality/i18n/sv.po
+++ b/addons/base_module_quality/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index 70a375d7c0d..28a08fc3ac4 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/uk.po b/addons/base_module_quality/i18n/uk.po
index bae45b84a26..dbcfcd3bf20 100644
--- a/addons/base_module_quality/i18n/uk.po
+++ b/addons/base_module_quality/i18n/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/zh_CN.po b/addons/base_module_quality/i18n/zh_CN.po
index c33660e799e..a4ee55061c2 100644
--- a/addons/base_module_quality/i18n/zh_CN.po
+++ b/addons/base_module_quality/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/zh_TW.po b/addons/base_module_quality/i18n/zh_TW.po
index 9510f8fb6b1..59c6a69b78f 100644
--- a/addons/base_module_quality/i18n/zh_TW.po
+++ b/addons/base_module_quality/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__openerp__.py
similarity index 100%
rename from addons/base_module_record/__terp__.py
rename to addons/base_module_record/__openerp__.py
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index cda1f4ebb82..97c0ada4bca 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -143,7 +143,7 @@ class base_module_record(osv.osv):
         obj = dt.browse(cr, uid, dtids[0])
         self.depends[obj.module] = True
         return obj.module+'.'+obj.name, obj.noupdate
-
+    
     def _create_record(self, cr, uid, doc, model, data, record_id, noupdate=False):
         
         data_pool = self.pool.get('ir.model.data')
@@ -384,7 +384,7 @@ class base_module_record(osv.osv):
         elif rec[3]=='create':
             id = self._create_id(cr, uid, rec[2],rec[4])
             record,noupdate = self._create_record(cr, uid, doc, rec[2], rec[4], id)
-            self.ids[(rec[3], result)] = id
+            self.ids[(rec[2], result)] = id
             record_list += record
 
         elif rec[3]=='copy':
@@ -446,8 +446,8 @@ class base_module_record(osv.osv):
                     terp.appendChild(data)
                     wkf = doc.createElement('workflow')
                     data.appendChild(wkf)
-                    wkf.setAttribute("model", rec[1][3])
-                    wkf.setAttribute("action", rec[1][4])
+                    wkf.setAttribute("model", rec[1][2])
+                    wkf.setAttribute("action", rec[1][3])
                     if noupdate:
                         data.setAttribute("noupdate", "1")
                     wkf.setAttribute("ref", rec_id)
@@ -482,10 +482,12 @@ class base_module_record(osv.osv):
                     continue
                 if self.mode == "workflow":
                     record= self._generate_object_yaml(cr, uid, rec[1],rec[0])
+                    yaml_file+="!comment Performing a workflow action %s on module %s"%(record['action'], record['model']) + '''\n'''
                     object=yaml.load(unicode('''\n !workflow %s \n'''%record,'iso-8859-1'))
-                    yaml_file += str(object) + '''\n'''
+                    yaml_file += str(object) + '''\n\n'''
                 else:
                     record= self._generate_object_yaml(cr, uid, rec[1],rec[3])
+                    yaml_file+="!comment Creating an %s record"%(record['model']) + '''\n'''
                     object= yaml.load(unicode('''\n !record %s \n'''%record,'iso-8859-1'))
                     yaml_file += str(object) + '''\n'''
                     attrs=yaml.dump(object.attrs, default_flow_style=False)
@@ -497,7 +499,9 @@ class base_module_record(osv.osv):
             if line.find('!record') == 0:
                 line = "- \n" + "  " + line
             elif line.find('!workflow') == 0:
-                line = "- \n" + "  " + line                    
+                line = "- \n" + "  " + line
+            elif line.find('!comment') == 0:
+                line=line.replace('!comment','- \n ')   
             elif line.find('- -') != -1:
                 line=line.replace('- -','  -')
                 line = "    " + line
diff --git a/addons/base_module_record/i18n/ar.po b/addons/base_module_record/i18n/ar.po
index def2b44aab4..8419abd30d1 100644
--- a/addons/base_module_record/i18n/ar.po
+++ b/addons/base_module_record/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/bg.po b/addons/base_module_record/i18n/bg.po
index 05b38e4c418..cb8dd63e6ba 100644
--- a/addons/base_module_record/i18n/bg.po
+++ b/addons/base_module_record/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/bs.po b/addons/base_module_record/i18n/bs.po
index def2b44aab4..8419abd30d1 100644
--- a/addons/base_module_record/i18n/bs.po
+++ b/addons/base_module_record/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/ca.po b/addons/base_module_record/i18n/ca.po
index 6e8291f392b..9e0d1990c9f 100644
--- a/addons/base_module_record/i18n/ca.po
+++ b/addons/base_module_record/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/cs.po b/addons/base_module_record/i18n/cs.po
index def2b44aab4..8419abd30d1 100644
--- a/addons/base_module_record/i18n/cs.po
+++ b/addons/base_module_record/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/de.po b/addons/base_module_record/i18n/de.po
index 60babf958b6..7f6d991e099 100644
--- a/addons/base_module_record/i18n/de.po
+++ b/addons/base_module_record/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/el.po b/addons/base_module_record/i18n/el.po
index f6e3a1f56c6..de0926a8e83 100644
--- a/addons/base_module_record/i18n/el.po
+++ b/addons/base_module_record/i18n/el.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_module_record/i18n/es.po b/addons/base_module_record/i18n/es.po
index 91e81b20364..e9ba64d3d20 100644
--- a/addons/base_module_record/i18n/es.po
+++ b/addons/base_module_record/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/es_AR.po b/addons/base_module_record/i18n/es_AR.po
index d2adf6e348d..ff86f579bc5 100644
--- a/addons/base_module_record/i18n/es_AR.po
+++ b/addons/base_module_record/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/et.po b/addons/base_module_record/i18n/et.po
index aa761cbcfbf..a3b9ed82566 100644
--- a/addons/base_module_record/i18n/et.po
+++ b/addons/base_module_record/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/fi.po b/addons/base_module_record/i18n/fi.po
index 0ed3e981175..7cda084ae89 100644
--- a/addons/base_module_record/i18n/fi.po
+++ b/addons/base_module_record/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/fr.po b/addons/base_module_record/i18n/fr.po
index f9e51e66f0b..a05ade0c01c 100644
--- a/addons/base_module_record/i18n/fr.po
+++ b/addons/base_module_record/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/gl.po b/addons/base_module_record/i18n/gl.po
index 55d236bface..dd84b589f07 100644
--- a/addons/base_module_record/i18n/gl.po
+++ b/addons/base_module_record/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/hr.po b/addons/base_module_record/i18n/hr.po
index 9ab91fe4270..e185c4ca82d 100644
--- a/addons/base_module_record/i18n/hr.po
+++ b/addons/base_module_record/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/base_module_record/i18n/hu.po b/addons/base_module_record/i18n/hu.po
index 7d315de9ad5..8419abd30d1 100644
--- a/addons/base_module_record/i18n/hu.po
+++ b/addons/base_module_record/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/id.po b/addons/base_module_record/i18n/id.po
index d5e32d16cbe..4faa59de1fd 100644
--- a/addons/base_module_record/i18n/id.po
+++ b/addons/base_module_record/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/it.po b/addons/base_module_record/i18n/it.po
index 835f78b1cd2..1d8d95a8801 100644
--- a/addons/base_module_record/i18n/it.po
+++ b/addons/base_module_record/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/ko.po b/addons/base_module_record/i18n/ko.po
index 85e1c4b3501..5e86cc5c444 100644
--- a/addons/base_module_record/i18n/ko.po
+++ b/addons/base_module_record/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/lt.po b/addons/base_module_record/i18n/lt.po
index 04d48d7a5c8..25c2fe9d67f 100644
--- a/addons/base_module_record/i18n/lt.po
+++ b/addons/base_module_record/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/nl.po b/addons/base_module_record/i18n/nl.po
index d9072638ec0..e0696f56550 100644
--- a/addons/base_module_record/i18n/nl.po
+++ b/addons/base_module_record/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/nl_BE.po b/addons/base_module_record/i18n/nl_BE.po
index 6367b60a5af..2ab38dc674b 100644
--- a/addons/base_module_record/i18n/nl_BE.po
+++ b/addons/base_module_record/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/pl.po b/addons/base_module_record/i18n/pl.po
index 910dbc2cac2..ffb7011cc01 100644
--- a/addons/base_module_record/i18n/pl.po
+++ b/addons/base_module_record/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/pt.po b/addons/base_module_record/i18n/pt.po
index 3f77757f2da..0f2094ca1ca 100644
--- a/addons/base_module_record/i18n/pt.po
+++ b/addons/base_module_record/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/pt_BR.po b/addons/base_module_record/i18n/pt_BR.po
index bceb647246e..84f0823963e 100644
--- a/addons/base_module_record/i18n/pt_BR.po
+++ b/addons/base_module_record/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/ro.po b/addons/base_module_record/i18n/ro.po
index 7bfb832b20f..c3041bf6e0a 100644
--- a/addons/base_module_record/i18n/ro.po
+++ b/addons/base_module_record/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po
index 0016ea889c0..e52b4b28a2e 100644
--- a/addons/base_module_record/i18n/ru.po
+++ b/addons/base_module_record/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2008-10-30 17:38+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-04-16 13:36+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -68,7 +68,7 @@ msgstr ""
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+msgstr "Демонстрационные данные"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
@@ -90,7 +90,7 @@ msgstr ""
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,check_date:0
 msgid "Record from Date"
-msgstr ""
+msgstr "Запись из данных"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -119,7 +119,7 @@ msgstr "Запись модуля"
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
 msgid "Export Customizations As a Module"
-msgstr ""
+msgstr "Экспортировать настройки как модуль"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -130,7 +130,7 @@ msgstr "Заранее благодарим за ваш вклад"
 #. module: base_module_record
 #: help:base_module_record.module_record_objects,init,objects:0
 msgid "List of objects to be recorded"
-msgstr ""
+msgstr "Список объектов записан"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,start_confirm:0
@@ -141,7 +141,7 @@ msgstr "Начать запись"
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Not Recording"
-msgstr ""
+msgstr "Не записан"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,description:0
@@ -158,7 +158,7 @@ msgstr "Название модуля"
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,objects:0
 msgid "Objects"
-msgstr ""
+msgstr "Объекты"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_file:0
@@ -185,7 +185,7 @@ msgstr "Запись остановлена"
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created"
-msgstr ""
+msgstr "Создана"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,end:0
@@ -207,17 +207,17 @@ msgstr "Ссылка на документацию"
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Modified"
-msgstr ""
+msgstr "Модифицирован"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Recording"
-msgstr ""
+msgstr "Записываю"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,init,record:0
 msgid "Record"
-msgstr ""
+msgstr "Запись"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,stop,end:0
@@ -231,19 +231,19 @@ msgstr "Далее"
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec_rec
 msgid "Module Recorder"
-msgstr ""
+msgstr "Модуль записи"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+msgstr "Нормализованные данные"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,end,end:0
 #: wizard_button:base_module_record.module_save,end,end:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -253,6 +253,10 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
+"Если Вы считаете, что Ваш модуль может быть интересен другим людям, мы "
+"советуем Вам опубликовать его на OpenERP.com в разделе 'Modules'. Вы можете "
+"сделать это через сайт или используя возможности из модуля "
+"'base_module_publish'."
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
@@ -270,7 +274,7 @@ msgstr "Модуль записи"
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr ""
+msgstr "Модуль создан"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -322,7 +326,7 @@ msgstr "Закрыть"
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created & Modified"
-msgstr ""
+msgstr "Создано и Модифицировано"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
diff --git a/addons/base_module_record/i18n/sk.po b/addons/base_module_record/i18n/sk.po
index 5774dbe16d5..40e58166470 100644
--- a/addons/base_module_record/i18n/sk.po
+++ b/addons/base_module_record/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/sl.po b/addons/base_module_record/i18n/sl.po
index 232621c2d9f..0f1741d5682 100644
--- a/addons/base_module_record/i18n/sl.po
+++ b/addons/base_module_record/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/sr.po b/addons/base_module_record/i18n/sr.po
index 5de93f537bc..0adaa44a54f 100644
--- a/addons/base_module_record/i18n/sr.po
+++ b/addons/base_module_record/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/sv.po b/addons/base_module_record/i18n/sv.po
index 87df02e1178..c1653b103f7 100644
--- a/addons/base_module_record/i18n/sv.po
+++ b/addons/base_module_record/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/tlh.po b/addons/base_module_record/i18n/tlh.po
index 8283e3fe1ad..fbd05ed62bd 100644
--- a/addons/base_module_record/i18n/tlh.po
+++ b/addons/base_module_record/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 536fc23635e..6dfe34b23e6 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/uk.po b/addons/base_module_record/i18n/uk.po
index 4ce7fb65b1a..e0768c3639b 100644
--- a/addons/base_module_record/i18n/uk.po
+++ b/addons/base_module_record/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/zh_CN.po b/addons/base_module_record/i18n/zh_CN.po
index 38d66ee5241..5fd344c1662 100644
--- a/addons/base_module_record/i18n/zh_CN.po
+++ b/addons/base_module_record/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_module_record/i18n/zh_TW.po b/addons/base_module_record/i18n/zh_TW.po
index f8324c9befa..dbf3baea331 100644
--- a/addons/base_module_record/i18n/zh_TW.po
+++ b/addons/base_module_record/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__openerp__.py
similarity index 100%
rename from addons/base_report_creator/__terp__.py
rename to addons/base_report_creator/__openerp__.py
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 00f23faba99..33c2608c85a 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -21,6 +21,7 @@
 
 from osv import fields, osv
 from tools.translate import _
+from tools import ustr
 
 class report_creator(osv.osv):
     """
@@ -45,9 +46,9 @@ class report_creator(osv.osv):
                 if key not in fields_to_export:
                     continue
                 if isinstance(value, tuple):
-                    datas.append(str(value[1]))
+                    datas.append(ustr(value[1]))
                 else:
-                    datas.append(str(value))
+                    datas.append(ustr(value))
             final_datas += [datas]
             #End Loop
         return {'datas': final_datas}
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index f9b4b901067..021bcbb5998 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -29,7 +29,7 @@
     </record>
 
 <!-- Report Creator form -->
-    
+
     <record model="ir.ui.view" id="base_report_creator_form">
         <field name="name">base_report_creator.report.form</field>
         <field name="model">base_report_creator.report</field>
@@ -37,17 +37,17 @@
         <field name="arch" type="xml">
             <form string="Report Creator">
                 <field name="name" select="1" colspan="4"/>
-                <field name="type" select="2"/>
-                <field name="active" select="2"/>
+                <field name="type"/>
+                <field name="active"/>
                 <notebook colspan="4">
                 <page string="General Configuration">
                     <field name="model_ids" colspan="4"
-                    	context="{'model_ids':model_ids}" />
+                        context="{'model_ids':model_ids}" />
                     <separator string="State"  colspan="4"/>
                     <field name="state"/>
                     <button string="Create Menu"
-                    	name="%(action_report_menu_create)d" type="action"
-                    	colspan="2" icon="gtk-justify-fill" />
+                        name="%(action_report_menu_create)d" type="action"
+                        colspan="2" icon="gtk-justify-fill" />
                 </page><page string="View parameters">
                     <separator string="Used View" colspan="4"/>
                     <field name="view_type1"/>
@@ -61,12 +61,12 @@
                         <form string="Fields">
                             <field name="sequence"/>
                             <field name="field_id"
-                            	domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []">
-                            	<tree string="Field List">
-                            		<field name="model_id" />
-                            		<field name="name" />
-                            		<field name="field_description" />
-                            	</tree>
+                                domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []">
+                                <tree string="Field List">
+                                    <field name="model_id" />
+                                    <field name="name" />
+                                    <field name="field_description" />
+                                </tree>
                             </field>
                             <field name="group_method"/>
                             <field name="graph_mode"/>
@@ -75,8 +75,8 @@
                         <tree editable="bottom" string="Fields to Display">
                             <field name="sequence"/>
                             <field name="field_id"
-                            	domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []"
-                            	attrs="{'required':[('group_method','!=','count')]}" />
+                                domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []"
+                                attrs="{'required':[('group_method','!=','count')]}" />
                             <field name="group_method"/>
                             <field name="graph_mode"/>
                             <field name="calendar_mode"/>
@@ -84,8 +84,8 @@
                     </field>
                 </page><page string="Filters on Fields">
                     <button string="Add filter"
-                    	name="%(wizard_set_filter_fields)d" type="action"
-                    	icon="gtk-add" />
+                        name="%(wizard_set_filter_fields)d" type="action"
+                        icon="gtk-add" />
                     <field name="filter_ids" nolabel="1" colspan="4">
                         <tree string="Filters">
                             <field name="name"/>
@@ -99,8 +99,8 @@
                     </field>
                     <separator string="Legend" colspan="4"/>
                     <label
-                    	string="Use %%(uid)s to filter by the connected user"
-                    	align="0.0" />
+                        string="Use %%(uid)s to filter by the connected user"
+                        align="0.0" />
 </page><page string="Security">
                     <separator string="Authorized Groups (empty for all)" colspan="4"/>
                     <field name="group_ids" colspan="4" nolabel="1"/>
@@ -111,22 +111,23 @@
             </form>
         </field>
     </record>
-    
+
  <!-- Action for Report creator form -->
-    
+
     <record model="ir.actions.act_window" id="base_report_creator_action">
-    	<field name="name">Custom Report</field>
+        <field name="name">Custom Reports</field>
         <field name="res_model">base_report_creator.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    
+
     <menuitem
         name="Custom Reports" id="base.menu_custom_reports"
+        groups="base.group_extended"
         action="base_report_creator_action" parent="base.reporting_menu" sequence="1"/>
-        
+
     <menuitem
-        name="Custom Reports" parent="base.next_id_50"
+        parent="base.next_id_50"
         id="menu_base_report_creator_action_config"
         action="base_report_creator_action"/>
 
@@ -140,22 +141,22 @@
             </tree>
         </field>
     </record>
-    
+
     <record model="ir.actions.act_window" id="base_report_creator_action_tree">
         <field name="res_model">base_report_creator.report</field>
         <field name="view_type">tree</field>
     </record>
-    
+
     <menuitem
         name="Custom Reports" parent="base.menu_custom_reports"
         id="menu_base_report_creator_action"
         action="base_report_creator_action_tree"/>
 
     <act_window id="action_report_open"
-    		key2="client_action_multi" name="Open Report"
-    		res_model="report.open" src_model="base_report_creator.report"
-    		view_mode="form" target="new" view_type="form" />
-    		
- 
+            key2="client_action_multi" name="Open Report"
+            res_model="report.open" src_model="base_report_creator.report"
+            view_mode="form" target="new" view_type="form" />
+
+
     </data>
 </openerp>
diff --git a/addons/base_report_creator/i18n/ar.po b/addons/base_report_creator/i18n/ar.po
index ad003fe1179..9e1ce588369 100644
--- a/addons/base_report_creator/i18n/ar.po
+++ b/addons/base_report_creator/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/bg.po b/addons/base_report_creator/i18n/bg.po
index 16f961a2de1..91a001ad6a9 100644
--- a/addons/base_report_creator/i18n/bg.po
+++ b/addons/base_report_creator/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/bs.po b/addons/base_report_creator/i18n/bs.po
index cdd9e1ddea4..62d088a2b29 100644
--- a/addons/base_report_creator/i18n/bs.po
+++ b/addons/base_report_creator/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ca.po b/addons/base_report_creator/i18n/ca.po
index d4dc763b1bd..c308458d988 100644
--- a/addons/base_report_creator/i18n/ca.po
+++ b/addons/base_report_creator/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/cs.po b/addons/base_report_creator/i18n/cs.po
index ad003fe1179..9e1ce588369 100644
--- a/addons/base_report_creator/i18n/cs.po
+++ b/addons/base_report_creator/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/de.po b/addons/base_report_creator/i18n/de.po
index 87bc375d118..3ddd4387be7 100644
--- a/addons/base_report_creator/i18n/de.po
+++ b/addons/base_report_creator/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/el.po b/addons/base_report_creator/i18n/el.po
index e5095909807..5bbf0b4dfa3 100644
--- a/addons/base_report_creator/i18n/el.po
+++ b/addons/base_report_creator/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_report_creator/i18n/es.po b/addons/base_report_creator/i18n/es.po
index db537472f43..7ec86768b66 100644
--- a/addons/base_report_creator/i18n/es.po
+++ b/addons/base_report_creator/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/es_AR.po b/addons/base_report_creator/i18n/es_AR.po
index 540cdc35dc8..50c7e499106 100644
--- a/addons/base_report_creator/i18n/es_AR.po
+++ b/addons/base_report_creator/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/et.po b/addons/base_report_creator/i18n/et.po
index bd89e98ccf9..8eddf4921c9 100644
--- a/addons/base_report_creator/i18n/et.po
+++ b/addons/base_report_creator/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/fi.po b/addons/base_report_creator/i18n/fi.po
index 752c22590b4..b368d62d6a6 100644
--- a/addons/base_report_creator/i18n/fi.po
+++ b/addons/base_report_creator/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/fr.po b/addons/base_report_creator/i18n/fr.po
index 109e6b7aa3a..8f06d5bb5cf 100644
--- a/addons/base_report_creator/i18n/fr.po
+++ b/addons/base_report_creator/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/hr.po b/addons/base_report_creator/i18n/hr.po
index 5c5ceec2a31..e8dff2322d6 100644
--- a/addons/base_report_creator/i18n/hr.po
+++ b/addons/base_report_creator/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/hu.po b/addons/base_report_creator/i18n/hu.po
index ad003fe1179..9e1ce588369 100644
--- a/addons/base_report_creator/i18n/hu.po
+++ b/addons/base_report_creator/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/id.po b/addons/base_report_creator/i18n/id.po
index 087e4b4c30e..8b4f17148c7 100644
--- a/addons/base_report_creator/i18n/id.po
+++ b/addons/base_report_creator/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/it.po b/addons/base_report_creator/i18n/it.po
index 3eca492900c..39b07208b13 100644
--- a/addons/base_report_creator/i18n/it.po
+++ b/addons/base_report_creator/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ko.po b/addons/base_report_creator/i18n/ko.po
index 4a92233df54..2c8b304234e 100644
--- a/addons/base_report_creator/i18n/ko.po
+++ b/addons/base_report_creator/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/lt.po b/addons/base_report_creator/i18n/lt.po
index ad003fe1179..9e1ce588369 100644
--- a/addons/base_report_creator/i18n/lt.po
+++ b/addons/base_report_creator/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/nl.po b/addons/base_report_creator/i18n/nl.po
index e02b0d343bf..aecab618128 100644
--- a/addons/base_report_creator/i18n/nl.po
+++ b/addons/base_report_creator/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/nl_BE.po b/addons/base_report_creator/i18n/nl_BE.po
index b10d04b1897..6d7a387782c 100644
--- a/addons/base_report_creator/i18n/nl_BE.po
+++ b/addons/base_report_creator/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/pl.po b/addons/base_report_creator/i18n/pl.po
index fb25c849ca8..2e80b9d8f02 100644
--- a/addons/base_report_creator/i18n/pl.po
+++ b/addons/base_report_creator/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/pt.po b/addons/base_report_creator/i18n/pt.po
index fb65de47d60..5946975516d 100644
--- a/addons/base_report_creator/i18n/pt.po
+++ b/addons/base_report_creator/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/pt_BR.po b/addons/base_report_creator/i18n/pt_BR.po
index 16805f800d3..7bc3ec657d5 100644
--- a/addons/base_report_creator/i18n/pt_BR.po
+++ b/addons/base_report_creator/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ro.po b/addons/base_report_creator/i18n/ro.po
index 53d537838c6..7d1ec9da1df 100644
--- a/addons/base_report_creator/i18n/ro.po
+++ b/addons/base_report_creator/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ru.po b/addons/base_report_creator/i18n/ru.po
index 43e1da5cef1..7eeef699005 100644
--- a/addons/base_report_creator/i18n/ru.po
+++ b/addons/base_report_creator/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sk.po b/addons/base_report_creator/i18n/sk.po
index 61d5492240c..3fc933a8afb 100644
--- a/addons/base_report_creator/i18n/sk.po
+++ b/addons/base_report_creator/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sl.po b/addons/base_report_creator/i18n/sl.po
index 4886a5e4bb3..c9e0af277e7 100644
--- a/addons/base_report_creator/i18n/sl.po
+++ b/addons/base_report_creator/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sr.po b/addons/base_report_creator/i18n/sr.po
index 354ace73ea3..1d97398193c 100644
--- a/addons/base_report_creator/i18n/sr.po
+++ b/addons/base_report_creator/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/sv.po b/addons/base_report_creator/i18n/sv.po
index 5e9d629d4b1..a41e8ffc3f5 100644
--- a/addons/base_report_creator/i18n/sv.po
+++ b/addons/base_report_creator/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/tlh.po b/addons/base_report_creator/i18n/tlh.po
index ec87f675604..e6b973611d1 100644
--- a/addons/base_report_creator/i18n/tlh.po
+++ b/addons/base_report_creator/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index 5b643309101..f09d7c1356f 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/uk.po b/addons/base_report_creator/i18n/uk.po
index 5cb941efa82..ba4b0617753 100644
--- a/addons/base_report_creator/i18n/uk.po
+++ b/addons/base_report_creator/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po
index fe2310ae80c..cb7aa055c9b 100644
--- a/addons/base_report_creator/i18n/zh_CN.po
+++ b/addons/base_report_creator/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/zh_TW.po b/addons/base_report_creator/i18n/zh_TW.po
index 5b1d890ee1f..05fb33f1e49 100644
--- a/addons/base_report_creator/i18n/zh_TW.po
+++ b/addons/base_report_creator/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_designer/__terp__.py b/addons/base_report_designer/__openerp__.py
similarity index 100%
rename from addons/base_report_designer/__terp__.py
rename to addons/base_report_designer/__openerp__.py
diff --git a/addons/base_report_designer/i18n/ar.po b/addons/base_report_designer/i18n/ar.po
index c65ae776e3e..4acb1d79ce0 100644
--- a/addons/base_report_designer/i18n/ar.po
+++ b/addons/base_report_designer/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/bg.po b/addons/base_report_designer/i18n/bg.po
index e21a255fb89..278248c259c 100644
--- a/addons/base_report_designer/i18n/bg.po
+++ b/addons/base_report_designer/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/bs.po b/addons/base_report_designer/i18n/bs.po
index 5b51ef22251..0f221da9e51 100644
--- a/addons/base_report_designer/i18n/bs.po
+++ b/addons/base_report_designer/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/ca.po b/addons/base_report_designer/i18n/ca.po
index e4f4308ec15..8350dbcca33 100644
--- a/addons/base_report_designer/i18n/ca.po
+++ b/addons/base_report_designer/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/cs.po b/addons/base_report_designer/i18n/cs.po
index bb5819ca5b4..77ac45c6544 100644
--- a/addons/base_report_designer/i18n/cs.po
+++ b/addons/base_report_designer/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/de.po b/addons/base_report_designer/i18n/de.po
index 33e329024b8..79a06a3fb1d 100644
--- a/addons/base_report_designer/i18n/de.po
+++ b/addons/base_report_designer/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/el.po b/addons/base_report_designer/i18n/el.po
index 88f3fc0c8c2..8ee955ddc6e 100644
--- a/addons/base_report_designer/i18n/el.po
+++ b/addons/base_report_designer/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_report_designer/i18n/es.po b/addons/base_report_designer/i18n/es.po
index 546cc5ba693..bff7b4c4455 100644
--- a/addons/base_report_designer/i18n/es.po
+++ b/addons/base_report_designer/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/es_AR.po b/addons/base_report_designer/i18n/es_AR.po
index 2826143423f..a23132b91a9 100644
--- a/addons/base_report_designer/i18n/es_AR.po
+++ b/addons/base_report_designer/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/et.po b/addons/base_report_designer/i18n/et.po
index 581c9d01c20..d2cda7caac5 100644
--- a/addons/base_report_designer/i18n/et.po
+++ b/addons/base_report_designer/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/fi.po b/addons/base_report_designer/i18n/fi.po
index 25548248f62..6b620ef0e8e 100644
--- a/addons/base_report_designer/i18n/fi.po
+++ b/addons/base_report_designer/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
index 7c6eff6cea8..35787f07245 100644
--- a/addons/base_report_designer/i18n/fr.po
+++ b/addons/base_report_designer/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/gl.po b/addons/base_report_designer/i18n/gl.po
index 3908345bc0b..9016a3a0ddf 100644
--- a/addons/base_report_designer/i18n/gl.po
+++ b/addons/base_report_designer/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index 38406fcfc95..f63fe3a567e 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/base_report_designer/i18n/hu.po b/addons/base_report_designer/i18n/hu.po
index 5b51ef22251..0f221da9e51 100644
--- a/addons/base_report_designer/i18n/hu.po
+++ b/addons/base_report_designer/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/id.po b/addons/base_report_designer/i18n/id.po
index 2cc21f79c09..899e6ceecfa 100644
--- a/addons/base_report_designer/i18n/id.po
+++ b/addons/base_report_designer/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 4ccb793a2fe..b29f0df5c8d 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/ko.po b/addons/base_report_designer/i18n/ko.po
index 8c8b8445106..12964da8ea1 100644
--- a/addons/base_report_designer/i18n/ko.po
+++ b/addons/base_report_designer/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/lt.po b/addons/base_report_designer/i18n/lt.po
index e9532b2e4b0..0f221da9e51 100644
--- a/addons/base_report_designer/i18n/lt.po
+++ b/addons/base_report_designer/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/nl.po b/addons/base_report_designer/i18n/nl.po
index 00d6528bfca..22c5b480b4c 100644
--- a/addons/base_report_designer/i18n/nl.po
+++ b/addons/base_report_designer/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/nl_BE.po b/addons/base_report_designer/i18n/nl_BE.po
index 2486bb80d67..53bda3bfc86 100644
--- a/addons/base_report_designer/i18n/nl_BE.po
+++ b/addons/base_report_designer/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/pl.po b/addons/base_report_designer/i18n/pl.po
index e5656cd2887..d6aef139076 100644
--- a/addons/base_report_designer/i18n/pl.po
+++ b/addons/base_report_designer/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/pt.po b/addons/base_report_designer/i18n/pt.po
index 3ca428660af..fcca83b904b 100644
--- a/addons/base_report_designer/i18n/pt.po
+++ b/addons/base_report_designer/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/pt_BR.po b/addons/base_report_designer/i18n/pt_BR.po
index e5bf850f4c9..df1647abf7c 100644
--- a/addons/base_report_designer/i18n/pt_BR.po
+++ b/addons/base_report_designer/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/ro.po b/addons/base_report_designer/i18n/ro.po
index 8064a7dbfbd..5296e6bab7d 100644
--- a/addons/base_report_designer/i18n/ro.po
+++ b/addons/base_report_designer/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/ru.po b/addons/base_report_designer/i18n/ru.po
index 54cf6bda270..7767b5a4744 100644
--- a/addons/base_report_designer/i18n/ru.po
+++ b/addons/base_report_designer/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sk.po b/addons/base_report_designer/i18n/sk.po
index 8abe8149874..59ae170ae96 100644
--- a/addons/base_report_designer/i18n/sk.po
+++ b/addons/base_report_designer/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sl.po b/addons/base_report_designer/i18n/sl.po
index 610f5a56a1b..b2b92424251 100644
--- a/addons/base_report_designer/i18n/sl.po
+++ b/addons/base_report_designer/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po
index a8829c93793..c1250cb3e10 100644
--- a/addons/base_report_designer/i18n/sr.po
+++ b/addons/base_report_designer/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/sv.po b/addons/base_report_designer/i18n/sv.po
index e9532b2e4b0..0f221da9e51 100644
--- a/addons/base_report_designer/i18n/sv.po
+++ b/addons/base_report_designer/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/tlh.po b/addons/base_report_designer/i18n/tlh.po
index c798d77b074..ba14ccb0593 100644
--- a/addons/base_report_designer/i18n/tlh.po
+++ b/addons/base_report_designer/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index 5db438c5d47..1269e06ebd6 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/uk.po b/addons/base_report_designer/i18n/uk.po
index cc80433200a..7dd6f437e3f 100644
--- a/addons/base_report_designer/i18n/uk.po
+++ b/addons/base_report_designer/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index 464f0c8894b..1800b4b3c45 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/zh_TW.po b/addons/base_report_designer/i18n/zh_TW.po
index 0f7585296c3..32bb9da0fd3 100644
--- a/addons/base_report_designer/i18n/zh_TW.po
+++ b/addons/base_report_designer/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__openerp__.py
similarity index 100%
rename from addons/base_setup/__terp__.py
rename to addons/base_setup/__openerp__.py
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index a28c7744158..0feb39bd563 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -17,6 +17,7 @@
                      string="You can start configuring the system or connect directly to the database using the default setup."/>
             </group>
           </group>
+          <separator string="" colspan="4"/>
           <button name="menu" icon="gtk-ok" type="object"
                   string="Use Directly"/>
           <button name="config" icon="gtk-go-forward" type="object"
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index df2c5908de9..7a6d61a0e08 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -50,8 +50,8 @@ If you don't think you need any of these right now, you can easily install them
     </record>
 
     <record id="base_setup_installer_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_base_setup_installer"/>
-      <field name="sequence">2</field>
+        <field name="action_id" ref="action_base_setup_installer"/>
+        <field name="sequence">2</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index c6baf194c6e..08691e60d35 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -14,7 +14,7 @@
           <group string="res_config_contents" position="replace">
             <field name="company_id" invisible="1"/>
 
-            <separator string="Define Main Company" colspan="4"/>
+            <separator string="Configure Your Company" colspan="4"/>
             <field name="name" colspan="4" required="True"/>
             <newline/>
             <field name="street"/>
@@ -54,8 +54,9 @@
     </record>
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
-      <field name="action_id" ref="action_base_setup_company"/>
-      <field name="sequence">1</field>
+        <field name="action_id" ref="action_base_setup_company"/>
+        <field name="sequence">1</field>
+        <field name="restart">onskip</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index ca7441b9ce3..d543b43907c 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index 8ff4f38cedf..9bd8678d3bc 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index ca7441b9ce3..d543b43907c 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index 78acd9a0286..5933c1ddd91 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index 229745ba879..6d16b383116 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index ff88b95261b..ddb520bbfeb 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index cba00d19dfd..0986600a25d 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index d760ddff5f8..f2413cd2f07 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index 29d7f434048..4f338415e97 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index 087c471efc7..2eea5905073 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index 035e0330abd..0a701e40c82 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 20f97693f3f..4977c9a4a3f 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-10 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index d656f45fd84..1be23805445 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index c5a3edb0e86..9b40a5d7c06 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index 019258d0f37..1101138c184 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index d38e175377c..0774c70a0e7 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index ca7441b9ce3..d543b43907c 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index f3daed533fc..33b0888c25e 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index a6d5352b798..808529903e6 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index ed036a536d2..19f5145120a 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index 6c956b1239b..43767cb8124 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 06cf576ce83..fb194a33bec 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index 414159895f3..deceec32701 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index 5c207031bbe..3f8cc4a1200 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index 837e2c3b815..5f890445b8a 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index e3aafe0a842..0d79e462618 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index b7995ce0b7d..a7fc864c1fc 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index c1f453ee60f..41beeaa3514 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index 2e443e99afd..8f93aee1a3f 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index a7e3b75091e..b1f6da3e5a9 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index 178ffdf907d..b0a3cf3c81a 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index 25bdcc8f9aa..08309cb84b7 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 885168ed80d..1d8778691c9 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index 6fd8891c539..b950758443a 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index f6abbff100d..815e1309439 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index 88df9c3bb0b..28346279934 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 1c5f7303d01..fbcd32cbffe 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index 198d91025d1..046049e3ba2 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__openerp__.py
similarity index 100%
rename from addons/base_vat/__terp__.py
rename to addons/base_vat/__openerp__.py
diff --git a/addons/base_vat/base_vat_data.xml b/addons/base_vat/base_vat_data.xml
index 287ad0ada8c..325c2c1ea4c 100644
--- a/addons/base_vat/base_vat_data.xml
+++ b/addons/base_vat/base_vat_data.xml
@@ -9,7 +9,7 @@
       <field name="arch" type="xml">
         <field name="property_account_payable" position="after">
             <group colspan="2" col="6">
-              <field name="vat" on_change="vat_change(vat)" select="2" colspan="4" />
+              <field name="vat" on_change="vat_change(vat)" colspan="4" />
               <field name="vat_subjected" colspan="1"/>
             </group>
         </field>
diff --git a/addons/base_vat/i18n/ar.po b/addons/base_vat/i18n/ar.po
index 4bae5a4d1f7..f8dab027727 100644
--- a/addons/base_vat/i18n/ar.po
+++ b/addons/base_vat/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/bg.po b/addons/base_vat/i18n/bg.po
index 65a3bac191c..6426c5a394b 100644
--- a/addons/base_vat/i18n/bg.po
+++ b/addons/base_vat/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/bs.po b/addons/base_vat/i18n/bs.po
index bd2cd3fde0c..fcd52158a2e 100644
--- a/addons/base_vat/i18n/bs.po
+++ b/addons/base_vat/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ca.po b/addons/base_vat/i18n/ca.po
index eb8ed30c8cc..d27e854dfe5 100644
--- a/addons/base_vat/i18n/ca.po
+++ b/addons/base_vat/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/cs.po b/addons/base_vat/i18n/cs.po
index 7041a13085e..905e0f7d57d 100644
--- a/addons/base_vat/i18n/cs.po
+++ b/addons/base_vat/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po
index 8a9913bf309..5b792e15a7c 100644
--- a/addons/base_vat/i18n/da.po
+++ b/addons/base_vat/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/de.po b/addons/base_vat/i18n/de.po
index 7bc6f203a43..8d4ce4022d6 100644
--- a/addons/base_vat/i18n/de.po
+++ b/addons/base_vat/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/el.po b/addons/base_vat/i18n/el.po
index f6df1998bb5..f3214427143 100644
--- a/addons/base_vat/i18n/el.po
+++ b/addons/base_vat/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/en_AU.po b/addons/base_vat/i18n/en_AU.po
index 1f5ec8fda80..7ead8defa17 100644
--- a/addons/base_vat/i18n/en_AU.po
+++ b/addons/base_vat/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/es.po b/addons/base_vat/i18n/es.po
index 34e8fa160aa..76a47b65ddc 100644
--- a/addons/base_vat/i18n/es.po
+++ b/addons/base_vat/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/es_AR.po b/addons/base_vat/i18n/es_AR.po
index 6efe522d319..aaecd4851c9 100644
--- a/addons/base_vat/i18n/es_AR.po
+++ b/addons/base_vat/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/et.po b/addons/base_vat/i18n/et.po
index 292ec740c9b..4b74eed12db 100644
--- a/addons/base_vat/i18n/et.po
+++ b/addons/base_vat/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/fi.po b/addons/base_vat/i18n/fi.po
index 44721ae50bb..3e376a07e06 100644
--- a/addons/base_vat/i18n/fi.po
+++ b/addons/base_vat/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index e0828329ca8..a4aca2656b2 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/gl.po b/addons/base_vat/i18n/gl.po
index d5231882bf5..68aef24f320 100644
--- a/addons/base_vat/i18n/gl.po
+++ b/addons/base_vat/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/hr.po b/addons/base_vat/i18n/hr.po
index 6f49cec5fa3..6925513b183 100644
--- a/addons/base_vat/i18n/hr.po
+++ b/addons/base_vat/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/hu.po b/addons/base_vat/i18n/hu.po
index 4bae5a4d1f7..f8dab027727 100644
--- a/addons/base_vat/i18n/hu.po
+++ b/addons/base_vat/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/id.po b/addons/base_vat/i18n/id.po
index 21c367c50aa..8881f0627cc 100644
--- a/addons/base_vat/i18n/id.po
+++ b/addons/base_vat/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index f6fc67b599e..3332641bfe2 100644
--- a/addons/base_vat/i18n/it.po
+++ b/addons/base_vat/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ko.po b/addons/base_vat/i18n/ko.po
index 179274deec7..378c068dc24 100644
--- a/addons/base_vat/i18n/ko.po
+++ b/addons/base_vat/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/lt.po b/addons/base_vat/i18n/lt.po
index d5e8c908781..7c0d9540b8c 100644
--- a/addons/base_vat/i18n/lt.po
+++ b/addons/base_vat/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/nb.po b/addons/base_vat/i18n/nb.po
index 903018e2336..c7415619fb3 100644
--- a/addons/base_vat/i18n/nb.po
+++ b/addons/base_vat/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/nl.po b/addons/base_vat/i18n/nl.po
index 5f46db488d7..715d4d8d866 100644
--- a/addons/base_vat/i18n/nl.po
+++ b/addons/base_vat/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/nl_BE.po b/addons/base_vat/i18n/nl_BE.po
index 69664458db2..ccebd5a505e 100644
--- a/addons/base_vat/i18n/nl_BE.po
+++ b/addons/base_vat/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/oc.po b/addons/base_vat/i18n/oc.po
index 46460347241..61505fcb89d 100644
--- a/addons/base_vat/i18n/oc.po
+++ b/addons/base_vat/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/pl.po b/addons/base_vat/i18n/pl.po
index d3916b5b349..a6d0f73365e 100644
--- a/addons/base_vat/i18n/pl.po
+++ b/addons/base_vat/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index c254bc113f1..4fb9b3a9d59 100644
--- a/addons/base_vat/i18n/pt.po
+++ b/addons/base_vat/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/pt_BR.po b/addons/base_vat/i18n/pt_BR.po
index b23ec95f7a4..2e5d526301a 100644
--- a/addons/base_vat/i18n/pt_BR.po
+++ b/addons/base_vat/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ro.po b/addons/base_vat/i18n/ro.po
index 735879b9f9d..25c99f7a2db 100644
--- a/addons/base_vat/i18n/ro.po
+++ b/addons/base_vat/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index cdb067976dc..399e86fe63c 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sk.po b/addons/base_vat/i18n/sk.po
index b188035d2cb..6fc812a2aee 100644
--- a/addons/base_vat/i18n/sk.po
+++ b/addons/base_vat/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sl.po b/addons/base_vat/i18n/sl.po
index 184984dee97..22d1c5f51c7 100644
--- a/addons/base_vat/i18n/sl.po
+++ b/addons/base_vat/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po
index a1e8ba7f3a0..6dcf7fed6a0 100644
--- a/addons/base_vat/i18n/sr.po
+++ b/addons/base_vat/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index 4bae5a4d1f7..00d33ce8413 100644
--- a/addons/base_vat/i18n/sv.po
+++ b/addons/base_vat/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/tlh.po b/addons/base_vat/i18n/tlh.po
index 107631a4949..738cf092128 100644
--- a/addons/base_vat/i18n/tlh.po
+++ b/addons/base_vat/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index c2748e26861..4d928ebf07f 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/uk.po b/addons/base_vat/i18n/uk.po
index 2efe05d4a8c..8c966858277 100644
--- a/addons/base_vat/i18n/uk.po
+++ b/addons/base_vat/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/zh_CN.po b/addons/base_vat/i18n/zh_CN.po
index 1b116c03bff..15c499a884a 100644
--- a/addons/base_vat/i18n/zh_CN.po
+++ b/addons/base_vat/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/zh_TW.po b/addons/base_vat/i18n/zh_TW.po
index 2747d823876..9673d3d92c2 100644
--- a/addons/base_vat/i18n/zh_TW.po
+++ b/addons/base_vat/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board/__terp__.py b/addons/board/__openerp__.py
similarity index 100%
rename from addons/board/__terp__.py
rename to addons/board/__openerp__.py
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 5c07de36472..ad397ac518e 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem icon="terp-graph" id="base.reporting_menu"
-        	name="Reporting" sequence="8" />
+            name="Reporting" sequence="8" />
 
  <!--Board Note Tree View  -->
 
@@ -67,9 +67,9 @@
                 <form string="Dashboard">
                     <field name="name" select="1"/>
                     <button colspan="2"
-                    	name="%(action_board_menu_create)d"
-                    	string="Create Menu" type="action"
-                    	icon="gtk-justify-fill" />
+                        name="%(action_board_menu_create)d"
+                        string="Create Menu" type="action"
+                        icon="gtk-justify-fill" />
                     <field colspan="4" name="line_ids">
                         <tree string="Dashboard View">
                             <field name="name"/>
@@ -83,7 +83,7 @@
                             <field name="width"/>
                             <field name="height"/>
                             <field name="action_id"
-                            	domain="[('view_type','!=','tree')]" />
+                                domain="[('view_type','!=','tree')]" />
                             <field name="position"/>
                         </form>
                     </field>
@@ -112,12 +112,12 @@
             parent="base.next_id_50" sequence="1"/>
 
         <menuitem action="action_view_board_note_form"
-        	id="menu_view_board_note_form" parent="base.next_id_50"
-        	sequence="3" groups="base.group_system" />
+            id="menu_view_board_note_form" parent="base.next_id_50"
+            sequence="3" groups="base.group_system" />
 
         <act_window context="{'view': active_id}" id="dashboard_open"
-        	multi="True" name="Open Dashboard" res_model="board.board"
-        	src_model="board.board" />
+            multi="True" name="Open Dashboard" res_model="board.board"
+            src_model="board.board" />
 
     </data>
 </openerp>
diff --git a/addons/board/i18n/ar.po b/addons/board/i18n/ar.po
index 39a61b5b959..58caa5af75c 100644
--- a/addons/board/i18n/ar.po
+++ b/addons/board/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/bg.po b/addons/board/i18n/bg.po
index 39c6275e28f..2a7bb1db123 100644
--- a/addons/board/i18n/bg.po
+++ b/addons/board/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/bs.po b/addons/board/i18n/bs.po
index 6bf37349682..f3f9d17aaaf 100644
--- a/addons/board/i18n/bs.po
+++ b/addons/board/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/ca.po b/addons/board/i18n/ca.po
index b6e220e61d0..f21ac729649 100644
--- a/addons/board/i18n/ca.po
+++ b/addons/board/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/cs.po b/addons/board/i18n/cs.po
index 22cf4974f62..60d96349e75 100644
--- a/addons/board/i18n/cs.po
+++ b/addons/board/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/de.po b/addons/board/i18n/de.po
index ca8e73d679e..8edb52f5110 100644
--- a/addons/board/i18n/de.po
+++ b/addons/board/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/el.po b/addons/board/i18n/el.po
index 0a1dacd68cc..e5ec2dd21ec 100644
--- a/addons/board/i18n/el.po
+++ b/addons/board/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board/i18n/es.po b/addons/board/i18n/es.po
index 79eb2c8db23..88c91e66c01 100644
--- a/addons/board/i18n/es.po
+++ b/addons/board/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/es_AR.po b/addons/board/i18n/es_AR.po
index 9ae6f88f65c..16dec9970d4 100644
--- a/addons/board/i18n/es_AR.po
+++ b/addons/board/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/et.po b/addons/board/i18n/et.po
index b1186912415..ceeac0b9861 100644
--- a/addons/board/i18n/et.po
+++ b/addons/board/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/fi.po b/addons/board/i18n/fi.po
index dc1d00c0f88..cfa9527a697 100644
--- a/addons/board/i18n/fi.po
+++ b/addons/board/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index 00c23ba774e..d5a3b50d575 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/gl.po b/addons/board/i18n/gl.po
index a074172a9a8..4f204a497ab 100644
--- a/addons/board/i18n/gl.po
+++ b/addons/board/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/hr.po b/addons/board/i18n/hr.po
index ed0ddb3187b..e719599e9fe 100644
--- a/addons/board/i18n/hr.po
+++ b/addons/board/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/hu.po b/addons/board/i18n/hu.po
index 39a61b5b959..58caa5af75c 100644
--- a/addons/board/i18n/hu.po
+++ b/addons/board/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/id.po b/addons/board/i18n/id.po
index 3d00a9122ae..8c3357a0c30 100644
--- a/addons/board/i18n/id.po
+++ b/addons/board/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/it.po b/addons/board/i18n/it.po
index 629e4319c12..6a3e8d0b3f6 100644
--- a/addons/board/i18n/it.po
+++ b/addons/board/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/ko.po b/addons/board/i18n/ko.po
index 6e7c898b316..ae9a8c480de 100644
--- a/addons/board/i18n/ko.po
+++ b/addons/board/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/lt.po b/addons/board/i18n/lt.po
index 98ae6960ca2..ba78ce3f462 100644
--- a/addons/board/i18n/lt.po
+++ b/addons/board/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/nl.po b/addons/board/i18n/nl.po
index 9ebbf048a9a..800f734c7d8 100644
--- a/addons/board/i18n/nl.po
+++ b/addons/board/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index 936f07e00c7..a16b538056f 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/pl.po b/addons/board/i18n/pl.po
index 204fc01da71..0ae1982d8bb 100644
--- a/addons/board/i18n/pl.po
+++ b/addons/board/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/pt.po b/addons/board/i18n/pt.po
index d6353424c12..d2766a3cc5c 100644
--- a/addons/board/i18n/pt.po
+++ b/addons/board/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/pt_BR.po b/addons/board/i18n/pt_BR.po
index 7f8737fce2d..dce5de72985 100644
--- a/addons/board/i18n/pt_BR.po
+++ b/addons/board/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/ro.po b/addons/board/i18n/ro.po
index a48ec13d25d..2540d1edc99 100644
--- a/addons/board/i18n/ro.po
+++ b/addons/board/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/ru.po b/addons/board/i18n/ru.po
index 4be7e63b286..a13e865b135 100644
--- a/addons/board/i18n/ru.po
+++ b/addons/board/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/sk.po b/addons/board/i18n/sk.po
index 66c8eaae79e..c87f3534c15 100644
--- a/addons/board/i18n/sk.po
+++ b/addons/board/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/sl.po b/addons/board/i18n/sl.po
index 57c7f31c3a5..90657ef71e0 100644
--- a/addons/board/i18n/sl.po
+++ b/addons/board/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/sv.po b/addons/board/i18n/sv.po
index f363ec57bdd..844655e9f3d 100644
--- a/addons/board/i18n/sv.po
+++ b/addons/board/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/tlh.po b/addons/board/i18n/tlh.po
index ff28c798060..73be0973a3d 100644
--- a/addons/board/i18n/tlh.po
+++ b/addons/board/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index a96e0d93472..2761c1f98c9 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/uk.po b/addons/board/i18n/uk.po
index b6dad68a2cc..2e852636c2b 100644
--- a/addons/board/i18n/uk.po
+++ b/addons/board/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index 45f17feedec..09d8d2cc527 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -30,12 +30,12 @@ msgstr "控制台"
 #. module: board
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr "作者"
+msgstr "建立者"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr "仪表盘主模块"
+msgstr "控制台主要模块"
 
 #. module: board
 #: view:board.note:0
@@ -51,7 +51,7 @@ msgstr "宽度"
 #. module: board
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在行动定义中的模式名称无效"
+msgstr "在动作定义中使用了无效的模快名。"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -62,7 +62,7 @@ msgstr "标题"
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
 #: model:ir.ui.menu,name:board.menu_view_board_form
 msgid "Dashboard Definition"
-msgstr "仪表盘定义"
+msgstr "控制台定义"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
@@ -103,7 +103,7 @@ msgstr "备注类型"
 #. module: board
 #: wizard_view:board.board.menu.create,init:0
 msgid "Create Menu For Dashboard"
-msgstr "创建仪表盘菜单"
+msgstr "创建控制台菜单"
 
 #. module: board
 #: constraint:ir.ui.view:0
@@ -130,12 +130,12 @@ msgstr "备注类型"
 #: field:board.board,name:0
 #: field:board.board.line,board_id:0
 msgid "Dashboard"
-msgstr "仪表盘"
+msgstr "控制台"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr "所有仪表盘的基础模块"
+msgstr "所有控制台的基础模块"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -145,7 +145,7 @@ msgstr "位置"
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr "打开仪表盘"
+msgstr "打开控制台"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_name:0
@@ -175,7 +175,7 @@ msgstr "右对齐"
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr "序列"
+msgstr "序号"
 
 #. module: board
 #: view:board.board:0
@@ -186,7 +186,7 @@ msgstr "创建菜单"
 #. module: board
 #: model:ir.ui.menu,name:board.dashboard_menu
 msgid "Dashboards"
-msgstr "仪表盘\""
+msgstr "控制台"
 
 #. module: board
 #: field:board.board.line,height:0
diff --git a/addons/board/i18n/zh_TW.po b/addons/board/i18n/zh_TW.po
index efe500ba54d..8b66af45003 100644
--- a/addons/board/i18n/zh_TW.po
+++ b/addons/board/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board_account/__terp__.py b/addons/board_account/__openerp__.py
similarity index 100%
rename from addons/board_account/__terp__.py
rename to addons/board_account/__openerp__.py
diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index 068e18bcf02..50b0fedd37e 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -71,8 +71,8 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_account_form"/>
         </record>
-		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-		<menuitem id="next_id_68" name="Accounting" parent="base.dashboard"
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem id="next_id_68" name="Accounting" parent="base.dashboard"
             groups="account.group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
     </data>
diff --git a/addons/board_account/i18n/ar.po b/addons/board_account/i18n/ar.po
index 64885050f91..5aaf095eeed 100644
--- a/addons/board_account/i18n/ar.po
+++ b/addons/board_account/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/bg.po b/addons/board_account/i18n/bg.po
index fd9d1d50fe4..39a5cf30b3d 100644
--- a/addons/board_account/i18n/bg.po
+++ b/addons/board_account/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/bs.po b/addons/board_account/i18n/bs.po
index b5111b44880..04a61cf88a5 100644
--- a/addons/board_account/i18n/bs.po
+++ b/addons/board_account/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/ca.po b/addons/board_account/i18n/ca.po
index 961f398bdf3..bf87d70725d 100644
--- a/addons/board_account/i18n/ca.po
+++ b/addons/board_account/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/cs.po b/addons/board_account/i18n/cs.po
index 64885050f91..5aaf095eeed 100644
--- a/addons/board_account/i18n/cs.po
+++ b/addons/board_account/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/de.po b/addons/board_account/i18n/de.po
index 7e4e5935720..bbfb95bedb5 100644
--- a/addons/board_account/i18n/de.po
+++ b/addons/board_account/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/el.po b/addons/board_account/i18n/el.po
index 5d4827014d3..ab5b8adcd16 100644
--- a/addons/board_account/i18n/el.po
+++ b/addons/board_account/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_account/i18n/es.po b/addons/board_account/i18n/es.po
index 9754c1b8e90..ee685de0463 100644
--- a/addons/board_account/i18n/es.po
+++ b/addons/board_account/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/es_AR.po b/addons/board_account/i18n/es_AR.po
index 63584310f9b..f51b50bc4cb 100644
--- a/addons/board_account/i18n/es_AR.po
+++ b/addons/board_account/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/et.po b/addons/board_account/i18n/et.po
index 575a2ffbf7c..208f111c329 100644
--- a/addons/board_account/i18n/et.po
+++ b/addons/board_account/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/fr.po b/addons/board_account/i18n/fr.po
index a93c79f36a6..dffe5ea37f1 100644
--- a/addons/board_account/i18n/fr.po
+++ b/addons/board_account/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/hr.po b/addons/board_account/i18n/hr.po
index 22dcb1085ed..03ee5bee2a9 100644
--- a/addons/board_account/i18n/hr.po
+++ b/addons/board_account/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/hu.po b/addons/board_account/i18n/hu.po
index 3e06a5cea12..fba7520add8 100644
--- a/addons/board_account/i18n/hu.po
+++ b/addons/board_account/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/id.po b/addons/board_account/i18n/id.po
index 98396a3cc01..8d199ea1798 100644
--- a/addons/board_account/i18n/id.po
+++ b/addons/board_account/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/it.po b/addons/board_account/i18n/it.po
index 71013e1ff3b..21e0aa62894 100644
--- a/addons/board_account/i18n/it.po
+++ b/addons/board_account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/ko.po b/addons/board_account/i18n/ko.po
index 78929b05086..737263c6a65 100644
--- a/addons/board_account/i18n/ko.po
+++ b/addons/board_account/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/lt.po b/addons/board_account/i18n/lt.po
index 64885050f91..5aaf095eeed 100644
--- a/addons/board_account/i18n/lt.po
+++ b/addons/board_account/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/nl.po b/addons/board_account/i18n/nl.po
index baa484709bb..b088479d9b6 100644
--- a/addons/board_account/i18n/nl.po
+++ b/addons/board_account/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/nl_BE.po b/addons/board_account/i18n/nl_BE.po
index 50620b8f217..db45db1c6fc 100644
--- a/addons/board_account/i18n/nl_BE.po
+++ b/addons/board_account/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/pl.po b/addons/board_account/i18n/pl.po
index 67f851f1822..9dcb5a5372b 100644
--- a/addons/board_account/i18n/pl.po
+++ b/addons/board_account/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/pt.po b/addons/board_account/i18n/pt.po
index 3f68a2ba90d..b7e23731591 100644
--- a/addons/board_account/i18n/pt.po
+++ b/addons/board_account/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/pt_BR.po b/addons/board_account/i18n/pt_BR.po
index 1fa6d99f155..c156348385c 100644
--- a/addons/board_account/i18n/pt_BR.po
+++ b/addons/board_account/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/ro.po b/addons/board_account/i18n/ro.po
index d7769c9044e..07fc008d4fc 100644
--- a/addons/board_account/i18n/ro.po
+++ b/addons/board_account/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/ru.po b/addons/board_account/i18n/ru.po
index 3b86324170b..a5f6d5c5810 100644
--- a/addons/board_account/i18n/ru.po
+++ b/addons/board_account/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/sk.po b/addons/board_account/i18n/sk.po
index 283d4d344e4..671f4af4946 100644
--- a/addons/board_account/i18n/sk.po
+++ b/addons/board_account/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/sl.po b/addons/board_account/i18n/sl.po
index ef01dbdc03e..c084591efdf 100644
--- a/addons/board_account/i18n/sl.po
+++ b/addons/board_account/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/sv.po b/addons/board_account/i18n/sv.po
index b107a848b43..e01d391fbcb 100644
--- a/addons/board_account/i18n/sv.po
+++ b/addons/board_account/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/tlh.po b/addons/board_account/i18n/tlh.po
index 9d4f884336c..a47a537dfe8 100644
--- a/addons/board_account/i18n/tlh.po
+++ b/addons/board_account/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/tr.po b/addons/board_account/i18n/tr.po
index 9eeffc40887..5c4d5fba909 100644
--- a/addons/board_account/i18n/tr.po
+++ b/addons/board_account/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/uk.po b/addons/board_account/i18n/uk.po
index 7e4704a6440..5cb9ab9b177 100644
--- a/addons/board_account/i18n/uk.po
+++ b/addons/board_account/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/zh_CN.po b/addons/board_account/i18n/zh_CN.po
index 04c80181e6d..54ea30c2430 100644
--- a/addons/board_account/i18n/zh_CN.po
+++ b/addons/board_account/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_account/i18n/zh_TW.po b/addons/board_account/i18n/zh_TW.po
index 3b0efb01cff..9dfabe78d2c 100644
--- a/addons/board_account/i18n/zh_TW.po
+++ b/addons/board_account/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
diff --git a/addons/board_association/__terp__.py b/addons/board_association/__openerp__.py
similarity index 100%
rename from addons/board_association/__terp__.py
rename to addons/board_association/__openerp__.py
diff --git a/addons/board_association/board_association_view.xml b/addons/board_association/board_association_view.xml
index d010fee617b..56b66cf150a 100644
--- a/addons/board_association/board_association_view.xml
+++ b/addons/board_association/board_association_view.xml
@@ -53,8 +53,8 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
-		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-		<menuitem id="board_associations" name="Associations" parent="base.dashboard" />
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem id="board_associations" name="Associations" parent="base.dashboard" />
         <menuitem
             name="Associations" parent="board_associations"
             action="open_board_associations_manager"
diff --git a/addons/board_association/i18n/ar.po b/addons/board_association/i18n/ar.po
index 01b5b43f8ec..980e7043491 100644
--- a/addons/board_association/i18n/ar.po
+++ b/addons/board_association/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/bg.po b/addons/board_association/i18n/bg.po
index b723fac90d5..fe1b89c6573 100644
--- a/addons/board_association/i18n/bg.po
+++ b/addons/board_association/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/bs.po b/addons/board_association/i18n/bs.po
index 44453e06de6..df6df300c81 100644
--- a/addons/board_association/i18n/bs.po
+++ b/addons/board_association/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/ca.po b/addons/board_association/i18n/ca.po
index 640c01b1a2f..9f6ff02c661 100644
--- a/addons/board_association/i18n/ca.po
+++ b/addons/board_association/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/cs.po b/addons/board_association/i18n/cs.po
index 8f6e2ea006e..a26643d3bd8 100644
--- a/addons/board_association/i18n/cs.po
+++ b/addons/board_association/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/de.po b/addons/board_association/i18n/de.po
index 739dddf9d11..9d54170acd1 100644
--- a/addons/board_association/i18n/de.po
+++ b/addons/board_association/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/el.po b/addons/board_association/i18n/el.po
index 5f625c5ee87..1455d017aa4 100644
--- a/addons/board_association/i18n/el.po
+++ b/addons/board_association/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_association/i18n/es.po b/addons/board_association/i18n/es.po
index b511b657eeb..6d45250aaf3 100644
--- a/addons/board_association/i18n/es.po
+++ b/addons/board_association/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/es_AR.po b/addons/board_association/i18n/es_AR.po
index 7bde13c0120..1d35e5761fc 100644
--- a/addons/board_association/i18n/es_AR.po
+++ b/addons/board_association/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/et.po b/addons/board_association/i18n/et.po
index 07e501ddb1b..111b2778492 100644
--- a/addons/board_association/i18n/et.po
+++ b/addons/board_association/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/fr.po b/addons/board_association/i18n/fr.po
index 01c720b8a05..bae34064b61 100644
--- a/addons/board_association/i18n/fr.po
+++ b/addons/board_association/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/gl.po b/addons/board_association/i18n/gl.po
index 4b3d118007a..ff813751bd8 100644
--- a/addons/board_association/i18n/gl.po
+++ b/addons/board_association/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/hr.po b/addons/board_association/i18n/hr.po
index bc5df611834..53e561b7559 100644
--- a/addons/board_association/i18n/hr.po
+++ b/addons/board_association/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/hu.po b/addons/board_association/i18n/hu.po
index 01b5b43f8ec..980e7043491 100644
--- a/addons/board_association/i18n/hu.po
+++ b/addons/board_association/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/id.po b/addons/board_association/i18n/id.po
index 408244ee79c..358ead9e98a 100644
--- a/addons/board_association/i18n/id.po
+++ b/addons/board_association/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/it.po b/addons/board_association/i18n/it.po
index c990a23ceff..0d25ad2bf4a 100644
--- a/addons/board_association/i18n/it.po
+++ b/addons/board_association/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/ko.po b/addons/board_association/i18n/ko.po
index 2f026f0de11..0b181a9eb27 100644
--- a/addons/board_association/i18n/ko.po
+++ b/addons/board_association/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/lt.po b/addons/board_association/i18n/lt.po
index f60acfbf77a..cf53291f10b 100644
--- a/addons/board_association/i18n/lt.po
+++ b/addons/board_association/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/nl.po b/addons/board_association/i18n/nl.po
index 3ca828b1120..4582b384d3a 100644
--- a/addons/board_association/i18n/nl.po
+++ b/addons/board_association/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/nl_BE.po b/addons/board_association/i18n/nl_BE.po
index d37c9bd003f..9f5dd9f62f9 100644
--- a/addons/board_association/i18n/nl_BE.po
+++ b/addons/board_association/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/pl.po b/addons/board_association/i18n/pl.po
index e8aa2b27bcd..8ff1931a458 100644
--- a/addons/board_association/i18n/pl.po
+++ b/addons/board_association/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/pt.po b/addons/board_association/i18n/pt.po
index 9f2f8fd8497..23703977a76 100644
--- a/addons/board_association/i18n/pt.po
+++ b/addons/board_association/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/pt_BR.po b/addons/board_association/i18n/pt_BR.po
index e3997888590..8599de06ba0 100644
--- a/addons/board_association/i18n/pt_BR.po
+++ b/addons/board_association/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/ro.po b/addons/board_association/i18n/ro.po
index 76c857e6732..81ae58bf48a 100644
--- a/addons/board_association/i18n/ro.po
+++ b/addons/board_association/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/ru.po b/addons/board_association/i18n/ru.po
index 162fb0712f6..1207948762a 100644
--- a/addons/board_association/i18n/ru.po
+++ b/addons/board_association/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/sl.po b/addons/board_association/i18n/sl.po
index f1e213819eb..165ce8617ab 100644
--- a/addons/board_association/i18n/sl.po
+++ b/addons/board_association/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/sv.po b/addons/board_association/i18n/sv.po
index 01b5b43f8ec..980e7043491 100644
--- a/addons/board_association/i18n/sv.po
+++ b/addons/board_association/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/tlh.po b/addons/board_association/i18n/tlh.po
index 2da3cbbf37a..2bdbb3f282b 100644
--- a/addons/board_association/i18n/tlh.po
+++ b/addons/board_association/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/tr.po b/addons/board_association/i18n/tr.po
index 25c253b2f31..bfcad14986d 100644
--- a/addons/board_association/i18n/tr.po
+++ b/addons/board_association/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/uk.po b/addons/board_association/i18n/uk.po
index a06fd3431e3..b889ab7205e 100644
--- a/addons/board_association/i18n/uk.po
+++ b/addons/board_association/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/zh_CN.po b/addons/board_association/i18n/zh_CN.po
index 4e5f8de5f7b..0b554d43be1 100644
--- a/addons/board_association/i18n/zh_CN.po
+++ b/addons/board_association/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_association/i18n/zh_TW.po b/addons/board_association/i18n/zh_TW.po
index 28392e6655f..9abd2bc9f35 100644
--- a/addons/board_association/i18n/zh_TW.po
+++ b/addons/board_association/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
diff --git a/addons/board_auction/__terp__.py b/addons/board_auction/__openerp__.py
similarity index 100%
rename from addons/board_auction/__terp__.py
rename to addons/board_auction/__openerp__.py
diff --git a/addons/board_auction/board_auction_manager_view.xml b/addons/board_auction/board_auction_manager_view.xml
index c20a6af14fd..88a1387f07e 100644
--- a/addons/board_auction/board_auction_manager_view.xml
+++ b/addons/board_auction/board_auction_manager_view.xml
@@ -1,81 +1,81 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<record model="board.note.type" id="note_auction_type1">
-			<field name="name">Auction manager</field>
-		</record>
+    <data>
+        <record model="board.note.type" id="note_auction_type1">
+            <field name="name">Auction manager</field>
+        </record>
 
-		<record model="ir.ui.view" id="board_auction_manager_form1">
-			<field name="name">board.auction.manager.form</field>
-			<field name="model">board.board</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Auction manager ">
-					<hpaned position="100">
-						<child1>
+        <record model="ir.ui.view" id="board_auction_manager_form1">
+            <field name="name">board.auction.manager.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Auction manager ">
+                    <hpaned position="100">
+                        <child1>
 
 
-							<action
-								string="Latest objects"
-								name="%(auction.action_report_latest_objects_manager_tree)d"
-								height="200"
-								width="510"	/>
-							<action string="Latest deposits"
-								name="%(auction.action_report_latest_doposit_manager_tree)d"/>
-							<action
-								string="Summary pointing by user"
-								name="%(auction.action_report_auction_sign_in_out_manager_tree1)d"
-								view_mode="tree,graph"
-							/>
-							<action string="Objects statistics"
-								name="%(auction.action_report_object_encoded_manager_tree)d"
-								/>
-</child1>
+                            <action
+                                string="Latest objects"
+                                name="%(auction.action_report_latest_objects_manager_tree)d"
+                                height="200"
+                                width="510"    />
+                            <action string="Latest deposits"
+                                name="%(auction.action_report_latest_doposit_manager_tree)d"/>
+                            <action
+                                string="Summary pointing by user"
+                                name="%(auction.action_report_auction_sign_in_out_manager_tree1)d"
+                                view_mode="tree,graph"
+                            />
+                            <action string="Objects statistics"
+                                name="%(auction.action_report_object_encoded_manager_tree)d"
+                                />
+                        </child1>
 
-						<child2>
-							<button
-								string="My board"
-								name="%(open_board_auction)d"
-								icon="terp-partner"
-								type="action"
-								colspan="4"
-								/>
-							<action
-								string="Total Adjudications"
-								name="%(auction.action_report_auction_adjudication_tree)d"
-								view_mode="graph,tree"
-								colspan="4"/>
-							<action
-								string="Min/Adj/Max"
-								name="%(auction.action_report_auction_estimation_adj_category_manager_tree)d"
-								view_mode="graph,tree" colspan="4" />
+                        <child2>
+                            <button
+                                string="My board"
+                                name="%(open_board_auction)d"
+                                icon="terp-partner"
+                                type="action"
+                                colspan="4"
+                                />
+                            <action
+                                string="Total Adjudications"
+                                name="%(auction.action_report_auction_adjudication_tree)d"
+                                view_mode="graph,tree"
+                                colspan="4"/>
+                            <action
+                                string="Min/Adj/Max"
+                                name="%(auction.action_report_auction_estimation_adj_category_manager_tree)d"
+                                view_mode="graph,tree" colspan="4" />
 
-							<action
-								string="Objects by day"
-								name="%(auction.action_report_auction_object_date_tree)d"
-								view_mode="graph,tree" colspan="4" />
+                            <action
+                                string="Objects by day"
+                                name="%(auction.action_report_auction_object_date_tree)d"
+                                view_mode="graph,tree" colspan="4" />
 
-						</child2>
-					</hpaned>
-				</form>
-			</field>
-		</record>
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="open_board_auction_manager">
-			<field name="name">Auction manager board</field>
-			<field name="res_model">board.board</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="usage">menu</field>
-			<field name="view_id" ref="board_auction_manager_form1"/>
-		</record>
-		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-		<menuitem name="Auction Manager" id="board_menu_auction_manager" parent="base.dashboard" />
-		<menuitem
-			name="Auction Manager"
-			action="open_board_auction_manager"
-			sequence="1"
-			id="menu_board_auction_manager" parent="board_menu_auction_manager"/>
+        <record model="ir.actions.act_window" id="open_board_auction_manager">
+            <field name="name">Auction manager board</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_auction_manager_form1"/>
+        </record>
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem name="Auction Manager" id="board_menu_auction_manager" parent="base.dashboard" />
+        <menuitem
+            name="Auction Manager"
+            action="open_board_auction_manager"
+            sequence="1"
+            id="menu_board_auction_manager" parent="board_menu_auction_manager"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/board_auction/board_auction_view.xml b/addons/board_auction/board_auction_view.xml
index 0099b6bd68e..51f345e89e7 100644
--- a/addons/board_auction/board_auction_view.xml
+++ b/addons/board_auction/board_auction_view.xml
@@ -1,70 +1,70 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-		<record model="board.note.type" id="note_auction_type">
-			<field name="name">Auction</field>
-		</record>
+        <record model="board.note.type" id="note_auction_type">
+            <field name="name">Auction</field>
+        </record>
 
-		<record model="ir.ui.view" id="board_auction_manager_form">
-			<field name="name">board.auction.manager.form</field>
-			<field name="model">board.board</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Auction manager ">
-					<hpaned position="100">
-						<child1>
-							<action
-								string="My Latest Objects"
-								name="%(auction.action_report_latest_objects_tree)d"
-								height="200"
-								width="510"/>
-							<action string="My Latest Deposits"
-								name="%(auction.action_report_latest_doposit_manager_tree)d"
-								domain="[('create_uid','=',uid)]"
-								/>
-							<action string="Objects statistics"
-								name="%(auction.action_report_object_encoded_member_tree)d"
-								/>
-							</child1>
+        <record model="ir.ui.view" id="board_auction_manager_form">
+            <field name="name">board.auction.manager.form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Auction manager ">
+                    <hpaned position="100">
+                        <child1>
+                            <action
+                                string="My Latest Objects"
+                                name="%(auction.action_report_latest_objects_tree)d"
+                                height="200"
+                                width="510"/>
+                            <action string="My Latest Deposits"
+                                name="%(auction.action_report_latest_doposit_manager_tree)d"
+                                domain="[('create_uid','=',uid)]"
+                                />
+                            <action string="Objects statistics"
+                                name="%(auction.action_report_object_encoded_member_tree)d"
+                                />
+                            </child1>
 
-						<child2>
-							<button
-								string="Menu"
-								name="%(base.action_menu_admin)d"
-								icon="gtk-justify-fill"
-								type="action"
-								colspan="4"/>
+                        <child2>
+                            <button
+                                string="Menu"
+                                name="%(base.action_menu_admin)d"
+                                icon="gtk-justify-fill"
+                                type="action"
+                                colspan="4"/>
 
-							<action
-								string="My Objects By Day"
-								name="%(auction.action_report_auction_object_date_tree)d"
-								view_mode="graph,tree" colspan="4"
-								domain="[('user_id','=',uid),('month','=',time.strftime('%%Y-%%m-01'))]"/>
-						<action
-								string="Estimations/Adjudication"
-								name="%(auction.action_report_auction_estimation_adj_category_member_tree)d"
-								view_mode="graph,tree" colspan="4"/>
-						</child2>
-					</hpaned>
-				</form>
-			</field>
-		</record>
+                            <action
+                                string="My Objects By Day"
+                                name="%(auction.action_report_auction_object_date_tree)d"
+                                view_mode="graph,tree" colspan="4"
+                                domain="[('user_id','=',uid),('month','=',time.strftime('%%Y-%%m-01'))]"/>
+                        <action
+                                string="Estimations/Adjudication"
+                                name="%(auction.action_report_auction_estimation_adj_category_member_tree)d"
+                                view_mode="graph,tree" colspan="4"/>
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="open_board_auction">
-			<field name="name">Auction member board</field>
-			<field name="res_model">board.board</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="usage">menu</field>
-			<field name="view_id" ref="board_auction_manager_form"/>
-		</record>
-		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-		<menuitem name="Auction Member" id="board_menu_auction_member" parent="base.dashboard" />
-		<menuitem
-			name="Auction Member"
-			action="open_board_auction"
-			sequence="1"
-			id="menu_board_auction" parent="board_menu_auction_member" />
+        <record model="ir.actions.act_window" id="open_board_auction">
+            <field name="name">Auction member board</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_auction_manager_form"/>
+        </record>
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem name="Auction Member" id="board_menu_auction_member" parent="base.dashboard" />
+        <menuitem
+            name="Auction Member"
+            action="open_board_auction"
+            sequence="1"
+            id="menu_board_auction" parent="board_menu_auction_member" />
 
 </data>
 </openerp>
diff --git a/addons/board_auction/i18n/ar.po b/addons/board_auction/i18n/ar.po
index a884ec196c5..bc249b9c605 100644
--- a/addons/board_auction/i18n/ar.po
+++ b/addons/board_auction/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/bg.po b/addons/board_auction/i18n/bg.po
index 86783d35da0..d0b6517c1b5 100644
--- a/addons/board_auction/i18n/bg.po
+++ b/addons/board_auction/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/bs.po b/addons/board_auction/i18n/bs.po
index 1511e0f5bbd..29b8df95e57 100644
--- a/addons/board_auction/i18n/bs.po
+++ b/addons/board_auction/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/ca.po b/addons/board_auction/i18n/ca.po
index dad27434f04..fde82671ef9 100644
--- a/addons/board_auction/i18n/ca.po
+++ b/addons/board_auction/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/cs.po b/addons/board_auction/i18n/cs.po
index a884ec196c5..bc249b9c605 100644
--- a/addons/board_auction/i18n/cs.po
+++ b/addons/board_auction/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/de.po b/addons/board_auction/i18n/de.po
index 7b26473b114..a207ca21498 100644
--- a/addons/board_auction/i18n/de.po
+++ b/addons/board_auction/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/el.po b/addons/board_auction/i18n/el.po
index d0cb7c3e11f..97c644b97fc 100644
--- a/addons/board_auction/i18n/el.po
+++ b/addons/board_auction/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_auction/i18n/es.po b/addons/board_auction/i18n/es.po
index 283140ace38..646fd1ff315 100644
--- a/addons/board_auction/i18n/es.po
+++ b/addons/board_auction/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/es_AR.po b/addons/board_auction/i18n/es_AR.po
index c168109e603..d6bcd13035d 100644
--- a/addons/board_auction/i18n/es_AR.po
+++ b/addons/board_auction/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/et.po b/addons/board_auction/i18n/et.po
index 7537ce6c39f..4ba7560307e 100644
--- a/addons/board_auction/i18n/et.po
+++ b/addons/board_auction/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/fr.po b/addons/board_auction/i18n/fr.po
index 611e8c3e9a9..075a5301b71 100644
--- a/addons/board_auction/i18n/fr.po
+++ b/addons/board_auction/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/hr.po b/addons/board_auction/i18n/hr.po
index 4dc642aa471..5e8e6acb028 100644
--- a/addons/board_auction/i18n/hr.po
+++ b/addons/board_auction/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/hu.po b/addons/board_auction/i18n/hu.po
index a884ec196c5..bc249b9c605 100644
--- a/addons/board_auction/i18n/hu.po
+++ b/addons/board_auction/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/id.po b/addons/board_auction/i18n/id.po
index ff55f9394f5..b9a39e3dd32 100644
--- a/addons/board_auction/i18n/id.po
+++ b/addons/board_auction/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/it.po b/addons/board_auction/i18n/it.po
index 9ba500c246e..a69c0c61e8e 100644
--- a/addons/board_auction/i18n/it.po
+++ b/addons/board_auction/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/ko.po b/addons/board_auction/i18n/ko.po
index 73cd672d0c5..5997e8df39e 100644
--- a/addons/board_auction/i18n/ko.po
+++ b/addons/board_auction/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/lt.po b/addons/board_auction/i18n/lt.po
index a884ec196c5..bc249b9c605 100644
--- a/addons/board_auction/i18n/lt.po
+++ b/addons/board_auction/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/nl.po b/addons/board_auction/i18n/nl.po
index ed109193c56..ec87d350ce1 100644
--- a/addons/board_auction/i18n/nl.po
+++ b/addons/board_auction/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/nl_BE.po b/addons/board_auction/i18n/nl_BE.po
index 617b2e5fecf..3c956d3c5b7 100644
--- a/addons/board_auction/i18n/nl_BE.po
+++ b/addons/board_auction/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/pl.po b/addons/board_auction/i18n/pl.po
index fda50efcdc8..8d120a13c53 100644
--- a/addons/board_auction/i18n/pl.po
+++ b/addons/board_auction/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/pt.po b/addons/board_auction/i18n/pt.po
index 8a0f3413dff..753d252eefd 100644
--- a/addons/board_auction/i18n/pt.po
+++ b/addons/board_auction/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/pt_BR.po b/addons/board_auction/i18n/pt_BR.po
index b261074558b..dbc2606a3a2 100644
--- a/addons/board_auction/i18n/pt_BR.po
+++ b/addons/board_auction/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/ro.po b/addons/board_auction/i18n/ro.po
index 657beb68b21..c751b873194 100644
--- a/addons/board_auction/i18n/ro.po
+++ b/addons/board_auction/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/ru.po b/addons/board_auction/i18n/ru.po
index fca4c2b9ec4..26ddbd0fb10 100644
--- a/addons/board_auction/i18n/ru.po
+++ b/addons/board_auction/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/sl.po b/addons/board_auction/i18n/sl.po
index 4ba0f979a26..4864c8ac657 100644
--- a/addons/board_auction/i18n/sl.po
+++ b/addons/board_auction/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/sv.po b/addons/board_auction/i18n/sv.po
index a884ec196c5..bc249b9c605 100644
--- a/addons/board_auction/i18n/sv.po
+++ b/addons/board_auction/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/tlh.po b/addons/board_auction/i18n/tlh.po
index a9f19690d52..28b4aeff956 100644
--- a/addons/board_auction/i18n/tlh.po
+++ b/addons/board_auction/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/tr.po b/addons/board_auction/i18n/tr.po
index 298ae9aa27b..7249c2ba07a 100644
--- a/addons/board_auction/i18n/tr.po
+++ b/addons/board_auction/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/uk.po b/addons/board_auction/i18n/uk.po
index 7f51918b4ae..a1cd3a0204d 100644
--- a/addons/board_auction/i18n/uk.po
+++ b/addons/board_auction/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/zh_CN.po b/addons/board_auction/i18n/zh_CN.po
index 4144f931cf8..4832859e2ef 100644
--- a/addons/board_auction/i18n/zh_CN.po
+++ b/addons/board_auction/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_auction/i18n/zh_TW.po b/addons/board_auction/i18n/zh_TW.po
index fa22e37ddfc..b45ed21bae3 100644
--- a/addons/board_auction/i18n/zh_TW.po
+++ b/addons/board_auction/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__openerp__.py
similarity index 100%
rename from addons/board_crm_configuration/__terp__.py
rename to addons/board_crm_configuration/__openerp__.py
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm_configuration/board_crm_statistical_view.xml
index 8dbe05735f0..2b3c348c6a4 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm_configuration/board_crm_statistical_view.xml
@@ -98,7 +98,7 @@
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
 
-		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             name="CRM Configuration" parent="base.dashboard"
             id="menu_board_crm_config"
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml
index 586a3c64baa..51f09c25d62 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm_configuration/board_crm_view.xml
@@ -1,123 +1,123 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<record model="board.note.type" id="note_crm_type">
-			<field name="name">CRM Configuration</field>
-		</record>
-		
-		<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
-			<field name="name">crm.opportunity.user.graph1</field>
-			<field name="model">report.crm.opportunity.user</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Opportunities by User and Section" type="pie">
-					<field name="state"/>
-					<field name="nbr" operator="+"/>
-				</graph>
-			</field>
-		</record>
+    <data>
+        <record model="board.note.type" id="note_crm_type">
+            <field name="name">CRM Configuration</field>
+        </record>
 
-		<record model="ir.actions.act_window" id="act_my_leads">
-			<field name="res_model">crm.lead</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="crm.crm_case_tree_view_leads"/>
+        <record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
+            <field name="name">crm.opportunity.user.graph1</field>
+            <field name="model">report.crm.opportunity.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunities by User and Section" type="pie">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="act_my_leads">
+            <field name="res_model">crm.lead</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_leads"/>
             <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-		</record>
+        </record>
 
-		<record model="ir.actions.act_window" id="act_my_meetings">
-			<field name="res_model">crm.meeting</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
-			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-		</record>
-		
-		<act_window name="My Cases"
-				domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
-				res_model="crm.case"
-				view_type="form"
-				view_mode="tree,form"
-				id="act_my_cases"/>
-
-		<record model="ir.actions.act_window" id="act_my_leads_stage">
-			<field name="res_model">report.crm.lead.section.stage</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree,form</field>
-			<field name="view_id" ref="view_crm_lead_stage_graph1"/>
+        <record model="ir.actions.act_window" id="act_my_meetings">
+            <field name="res_model">crm.meeting</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
             <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-		</record>
+        </record>
 
-		<record model="ir.actions.act_window" id="act_sales_pipeline">
-			<field name="res_model">report.crm.opportunity.user</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree,form</field>
-			<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
-			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-		</record>
+        <act_window name="My Cases"
+                domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
+                res_model="crm.case"
+                view_type="form"
+                view_mode="tree,form"
+                id="act_my_cases"/>
 
-		<record model="ir.ui.view" id="board_crm_form">
-			<field name="name">CRM - Dashboard Form</field>
-			<field name="model">board.board</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Connecting Dashboard">
-					<hpaned>
+        <record model="ir.actions.act_window" id="act_my_leads_stage">
+            <field name="res_model">report.crm.lead.section.stage</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_lead_stage_graph1"/>
+            <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+        </record>
 
-						<child1>
+        <record model="ir.actions.act_window" id="act_sales_pipeline">
+            <field name="res_model">report.crm.opportunity.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_opportunity_user_graph1"/>
+            <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+        </record>
 
-							<action
+        <record model="ir.ui.view" id="board_crm_form">
+            <field name="name">CRM - Dashboard Form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Connecting Dashboard">
+                    <hpaned>
+
+                        <child1>
+
+                            <action
                                 string="My Leads"
-								name="%(act_my_leads)d"
-								colspan="4"
-								height="150"
-								width="510"/>
+                                name="%(act_my_leads)d"
+                                colspan="4"
+                                height="150"
+                                width="510"/>
 
-							<action
-								string="My Meetings"
-								name="%(act_my_meetings)d"
-								height="150"
-								colspan="4"/>
-	
-							<action
-								string="My Cases"
-								name="%(act_my_cases)d"
-								colspan="4"
-								height="200"/>
+                            <action
+                                string="My Meetings"
+                                name="%(act_my_meetings)d"
+                                height="150"
+                                colspan="4"/>
 
-						</child1>
+                            <action
+                                string="My Cases"
+                                name="%(act_my_cases)d"
+                                colspan="4"
+                                height="200"/>
 
-						<child2>
-							<action
+                        </child1>
+
+                        <child2>
+                            <action
                                 string="My Leads By Stage"
-								name="%(act_my_leads_stage)d"
-								colspan="4"/>
+                                name="%(act_my_leads_stage)d"
+                                colspan="4"/>
 
-							<action
-								string="My Sales Pipeline"
-								name="%(act_sales_pipeline)d"
-								colspan="4"/>
+                            <action
+                                string="My Sales Pipeline"
+                                name="%(act_sales_pipeline)d"
+                                colspan="4"/>
 
-						</child2>
-					</hpaned>
-				</form>
-			</field>
-		</record>
-		<record model="ir.actions.act_window" id="open_board_crm">
-			<field name="name">CRM Dashboard</field>
-			<field name="res_model">board.board</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="usage">menu</field>
-			<field name="view_id" ref="board_crm_form"/>
-		</record>
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="open_board_crm">
+            <field name="name">CRM Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_crm_form"/>
+        </record>
 
-		<menuitem
-			name="Connecting Dashboard" parent="menu_board_crm_config"
-			action="open_board_crm"
-			sequence="1"
-			id="menu_board_crm" icon="terp-graph"/>
+        <menuitem
+            name="Connecting Dashboard" parent="menu_board_crm_config"
+            action="open_board_crm"
+            sequence="1"
+            id="menu_board_crm" icon="terp-graph"/>
 
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/board_crm_configuration/i18n/ar.po b/addons/board_crm_configuration/i18n/ar.po
index d315a61cdb3..a1f04c572c9 100644
--- a/addons/board_crm_configuration/i18n/ar.po
+++ b/addons/board_crm_configuration/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/bg.po b/addons/board_crm_configuration/i18n/bg.po
index 10120f52836..4ebf7a02bfe 100644
--- a/addons/board_crm_configuration/i18n/bg.po
+++ b/addons/board_crm_configuration/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/bs.po b/addons/board_crm_configuration/i18n/bs.po
index 8df5e1030e9..f2a469e0e82 100644
--- a/addons/board_crm_configuration/i18n/bs.po
+++ b/addons/board_crm_configuration/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/ca.po b/addons/board_crm_configuration/i18n/ca.po
index 127579c4d15..37cd6ea2991 100644
--- a/addons/board_crm_configuration/i18n/ca.po
+++ b/addons/board_crm_configuration/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/cs.po b/addons/board_crm_configuration/i18n/cs.po
index 770be218d90..44ac386a910 100644
--- a/addons/board_crm_configuration/i18n/cs.po
+++ b/addons/board_crm_configuration/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/de.po b/addons/board_crm_configuration/i18n/de.po
index ba937ff3423..4184efc3ef4 100644
--- a/addons/board_crm_configuration/i18n/de.po
+++ b/addons/board_crm_configuration/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/el.po b/addons/board_crm_configuration/i18n/el.po
index cad9f6edde9..6c96912faea 100644
--- a/addons/board_crm_configuration/i18n/el.po
+++ b/addons/board_crm_configuration/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_crm_configuration/i18n/es.po b/addons/board_crm_configuration/i18n/es.po
index f2c6c69e5d9..80ab7781d96 100644
--- a/addons/board_crm_configuration/i18n/es.po
+++ b/addons/board_crm_configuration/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/es_AR.po b/addons/board_crm_configuration/i18n/es_AR.po
index 846dcefae11..5b95554d471 100644
--- a/addons/board_crm_configuration/i18n/es_AR.po
+++ b/addons/board_crm_configuration/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/et.po b/addons/board_crm_configuration/i18n/et.po
index c9659fd369c..4006fa4ddc3 100644
--- a/addons/board_crm_configuration/i18n/et.po
+++ b/addons/board_crm_configuration/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/fr.po b/addons/board_crm_configuration/i18n/fr.po
index eeee00c3e67..aa5d4da0809 100644
--- a/addons/board_crm_configuration/i18n/fr.po
+++ b/addons/board_crm_configuration/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/hr.po b/addons/board_crm_configuration/i18n/hr.po
index cea1072de61..839e816263e 100644
--- a/addons/board_crm_configuration/i18n/hr.po
+++ b/addons/board_crm_configuration/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/hu.po b/addons/board_crm_configuration/i18n/hu.po
index d315a61cdb3..a1f04c572c9 100644
--- a/addons/board_crm_configuration/i18n/hu.po
+++ b/addons/board_crm_configuration/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/id.po b/addons/board_crm_configuration/i18n/id.po
index 8a822cf4f1f..38ea1370e32 100644
--- a/addons/board_crm_configuration/i18n/id.po
+++ b/addons/board_crm_configuration/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm_configuration/i18n/it.po
index e14d62beaad..9a504db07f7 100644
--- a/addons/board_crm_configuration/i18n/it.po
+++ b/addons/board_crm_configuration/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/ko.po b/addons/board_crm_configuration/i18n/ko.po
index c2ef7fddfc0..26280e98959 100644
--- a/addons/board_crm_configuration/i18n/ko.po
+++ b/addons/board_crm_configuration/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/lt.po b/addons/board_crm_configuration/i18n/lt.po
index d315a61cdb3..a1f04c572c9 100644
--- a/addons/board_crm_configuration/i18n/lt.po
+++ b/addons/board_crm_configuration/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/nl.po b/addons/board_crm_configuration/i18n/nl.po
index 40adcb1702c..daed4dda33e 100644
--- a/addons/board_crm_configuration/i18n/nl.po
+++ b/addons/board_crm_configuration/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/nl_BE.po b/addons/board_crm_configuration/i18n/nl_BE.po
index d90499dbd14..2804eb424df 100644
--- a/addons/board_crm_configuration/i18n/nl_BE.po
+++ b/addons/board_crm_configuration/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/pl.po b/addons/board_crm_configuration/i18n/pl.po
index 56d64e1bc88..3fccd9ec7e5 100644
--- a/addons/board_crm_configuration/i18n/pl.po
+++ b/addons/board_crm_configuration/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/pt.po b/addons/board_crm_configuration/i18n/pt.po
index 8ac07a2fc56..af2463598f0 100644
--- a/addons/board_crm_configuration/i18n/pt.po
+++ b/addons/board_crm_configuration/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/pt_BR.po b/addons/board_crm_configuration/i18n/pt_BR.po
index c8fb96376b4..3ffcf1379a8 100644
--- a/addons/board_crm_configuration/i18n/pt_BR.po
+++ b/addons/board_crm_configuration/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/ro.po b/addons/board_crm_configuration/i18n/ro.po
index 915df8eec13..8a822b3545f 100644
--- a/addons/board_crm_configuration/i18n/ro.po
+++ b/addons/board_crm_configuration/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/ru.po b/addons/board_crm_configuration/i18n/ru.po
index e63164f2a75..bf626258f69 100644
--- a/addons/board_crm_configuration/i18n/ru.po
+++ b/addons/board_crm_configuration/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/sk.po b/addons/board_crm_configuration/i18n/sk.po
index 42e8e1faf03..84632bac5c2 100644
--- a/addons/board_crm_configuration/i18n/sk.po
+++ b/addons/board_crm_configuration/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/sl.po b/addons/board_crm_configuration/i18n/sl.po
index 4ec46ba138b..5d540ae0090 100644
--- a/addons/board_crm_configuration/i18n/sl.po
+++ b/addons/board_crm_configuration/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/sv.po b/addons/board_crm_configuration/i18n/sv.po
index d315a61cdb3..a1f04c572c9 100644
--- a/addons/board_crm_configuration/i18n/sv.po
+++ b/addons/board_crm_configuration/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/tlh.po b/addons/board_crm_configuration/i18n/tlh.po
index 81a9c9b3f75..4f280ef633e 100644
--- a/addons/board_crm_configuration/i18n/tlh.po
+++ b/addons/board_crm_configuration/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/tr.po b/addons/board_crm_configuration/i18n/tr.po
index abc4e6f2fd1..9ece4d9fe9d 100644
--- a/addons/board_crm_configuration/i18n/tr.po
+++ b/addons/board_crm_configuration/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/uk.po b/addons/board_crm_configuration/i18n/uk.po
index 5e1b840ebb0..d0ef4ea1f9a 100644
--- a/addons/board_crm_configuration/i18n/uk.po
+++ b/addons/board_crm_configuration/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/zh_CN.po b/addons/board_crm_configuration/i18n/zh_CN.po
index abcf5e26caa..c7b398314ba 100644
--- a/addons/board_crm_configuration/i18n/zh_CN.po
+++ b/addons/board_crm_configuration/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_crm_configuration/i18n/zh_TW.po b/addons/board_crm_configuration/i18n/zh_TW.po
index c23bd6742d4..f9ab8e05b20 100644
--- a/addons/board_crm_configuration/i18n/zh_TW.po
+++ b/addons/board_crm_configuration/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
diff --git a/addons/board_document/__terp__.py b/addons/board_document/__openerp__.py
similarity index 96%
rename from addons/board_document/__terp__.py
rename to addons/board_document/__openerp__.py
index 77fd09fdf45..3dcd00627b4 100644
--- a/addons/board_document/__terp__.py
+++ b/addons/board_document/__openerp__.py
@@ -32,7 +32,7 @@
         * Files by Month (graph)
     """,
     'author': 'Tiny',
-    'depends': ['board', 'document', 'report_document'],
+    'depends': ['board', 'document'],
     'update_xml': ['board_document_view.xml'],
     'demo_xml': ['board_document_demo.xml'],
     'installable': True,
diff --git a/addons/board_document/board_document_view.xml b/addons/board_document/board_document_view.xml
index a35e6f9efe7..4d89f96cbfb 100644
--- a/addons/board_document/board_document_view.xml
+++ b/addons/board_document/board_document_view.xml
@@ -15,24 +15,24 @@
                         <child1>
                             <action
                                 string="New Files"
-                                name="%(report_document.action_view_all_document_tree1)d"
+                                name="%(document.action_view_all_document_tree1)d"
                                 view_mode="tree"
-                                domain="[('name','=',time.strftime('%%Y-%%m-01'))]"/>
+                                domain="[('name','=',time.strftime('%%Y')),('month','=',time.strftime('%%m'))]"/>
 
                             <action
                                 string="File Size by Month"
-                                name="%(report_document.action_view_size_month)d"
+                                name="%(document.action_view_size_month)d"
                                 view_mode="graph,tree"/>
                         </child1>
                         <child2>
                             <action
                                 string="Files by Resource Type"
-                                name="%(report_document.action_view_document_by_resourcetype_graph)d"
+                                name="%(document.action_view_document_by_resourcetype_graph)d"
                                 view_mode="graph,tree"/>
 
                             <action
                                 string="Files by Partner"
-                                name="%(report_document.action_view_files_by_partner)d"
+                                name="%(document.action_view_files_by_partner)d"
                                 view_mode="graph,tree"/>
                         </child2>
                      </hpaned>
@@ -50,7 +50,7 @@
             <field name="view_id" ref="board_document_manager_form"/>
          </record>
 
-		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
          <menuitem
             name="Document"
             id="menu_board_document"
@@ -75,19 +75,19 @@
                         <child1>
                             <action
                                 string="Wall of Shame"
-                                name="%(report_document.action_view_wall)d"
+                                name="%(document.action_view_wall)d"
                                 view_mode="tree"/>
 
                         </child1>
                         <child2>
                             <action
                                 string="Files by Users"
-                                name="%(report_document.action_view_user_graph)d"
+                                name="%(document.action_view_user_graph)d"
                                 view_mode="graph,tree"/>
 
                             <action
                                 string="Files by Month"
-                                name="%(report_document.action_view_files_by_month_graph)d"
+                                name="%(document.action_view_files_by_month_graph)d"
                                 view_mode="graph,tree"/>
                         </child2>
                      </hpaned>
diff --git a/addons/board_document/i18n/ar.po b/addons/board_document/i18n/ar.po
index f68394a82ce..c9734c6d53d 100644
--- a/addons/board_document/i18n/ar.po
+++ b/addons/board_document/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/bg.po b/addons/board_document/i18n/bg.po
index 7af902f3ed2..258291912d6 100644
--- a/addons/board_document/i18n/bg.po
+++ b/addons/board_document/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/bs.po b/addons/board_document/i18n/bs.po
index 4b39265fb90..01a610243d4 100644
--- a/addons/board_document/i18n/bs.po
+++ b/addons/board_document/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/ca.po b/addons/board_document/i18n/ca.po
index cf85b388a3b..fbec665ac6e 100644
--- a/addons/board_document/i18n/ca.po
+++ b/addons/board_document/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/cs.po b/addons/board_document/i18n/cs.po
index f68394a82ce..c9734c6d53d 100644
--- a/addons/board_document/i18n/cs.po
+++ b/addons/board_document/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/de.po b/addons/board_document/i18n/de.po
index b59f21df532..24cd27cd3f4 100644
--- a/addons/board_document/i18n/de.po
+++ b/addons/board_document/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/el.po b/addons/board_document/i18n/el.po
index acb5af53821..785fb732519 100644
--- a/addons/board_document/i18n/el.po
+++ b/addons/board_document/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_document/i18n/es.po b/addons/board_document/i18n/es.po
index 1215ee5e375..d0949f5a085 100644
--- a/addons/board_document/i18n/es.po
+++ b/addons/board_document/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/es_AR.po b/addons/board_document/i18n/es_AR.po
index 446659892e1..d2094d7b8e5 100644
--- a/addons/board_document/i18n/es_AR.po
+++ b/addons/board_document/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/et.po b/addons/board_document/i18n/et.po
index 0625f22ac19..f51dd897dcf 100644
--- a/addons/board_document/i18n/et.po
+++ b/addons/board_document/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/fr.po b/addons/board_document/i18n/fr.po
index 07b585c96bb..f1276352bee 100644
--- a/addons/board_document/i18n/fr.po
+++ b/addons/board_document/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/hr.po b/addons/board_document/i18n/hr.po
index bba330fcfae..550defbceda 100644
--- a/addons/board_document/i18n/hr.po
+++ b/addons/board_document/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/hu.po b/addons/board_document/i18n/hu.po
index f68394a82ce..c9734c6d53d 100644
--- a/addons/board_document/i18n/hu.po
+++ b/addons/board_document/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/id.po b/addons/board_document/i18n/id.po
index 39b29ef4af1..082bc25eed6 100644
--- a/addons/board_document/i18n/id.po
+++ b/addons/board_document/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/it.po b/addons/board_document/i18n/it.po
index 1e455b1357b..8de44b529d7 100644
--- a/addons/board_document/i18n/it.po
+++ b/addons/board_document/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/ko.po b/addons/board_document/i18n/ko.po
index d7f5fe65167..6d22fcea9ae 100644
--- a/addons/board_document/i18n/ko.po
+++ b/addons/board_document/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/lt.po b/addons/board_document/i18n/lt.po
index f68394a82ce..c9734c6d53d 100644
--- a/addons/board_document/i18n/lt.po
+++ b/addons/board_document/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/nl.po b/addons/board_document/i18n/nl.po
index 72873f366ff..a9b23572173 100644
--- a/addons/board_document/i18n/nl.po
+++ b/addons/board_document/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/pl.po b/addons/board_document/i18n/pl.po
index 2e74a77e9ed..74763d621cc 100644
--- a/addons/board_document/i18n/pl.po
+++ b/addons/board_document/i18n/pl.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-02-09 17:31+0000\n"
-"Last-Translator: Antoni Górski <Unknown>\n"
+"Last-Translator: Antoni Górski <gorskiantoni@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-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/pt.po b/addons/board_document/i18n/pt.po
index dd7fff490b5..325fa346989 100644
--- a/addons/board_document/i18n/pt.po
+++ b/addons/board_document/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/pt_BR.po b/addons/board_document/i18n/pt_BR.po
index ea7628d22c8..f94ef035af0 100644
--- a/addons/board_document/i18n/pt_BR.po
+++ b/addons/board_document/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/ro.po b/addons/board_document/i18n/ro.po
index b184a59ecc9..2a221348680 100644
--- a/addons/board_document/i18n/ro.po
+++ b/addons/board_document/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/ru.po b/addons/board_document/i18n/ru.po
index cdfc90a771c..b13b641ee95 100644
--- a/addons/board_document/i18n/ru.po
+++ b/addons/board_document/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/sk.po b/addons/board_document/i18n/sk.po
index ef5cbe02cde..080c536008a 100644
--- a/addons/board_document/i18n/sk.po
+++ b/addons/board_document/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/sl.po b/addons/board_document/i18n/sl.po
index 8c45d4bc902..a608d369d1c 100644
--- a/addons/board_document/i18n/sl.po
+++ b/addons/board_document/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/sv.po b/addons/board_document/i18n/sv.po
index f68394a82ce..c9734c6d53d 100644
--- a/addons/board_document/i18n/sv.po
+++ b/addons/board_document/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/tlh.po b/addons/board_document/i18n/tlh.po
index 1b833e00c2f..874db6d4acd 100644
--- a/addons/board_document/i18n/tlh.po
+++ b/addons/board_document/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/tr.po b/addons/board_document/i18n/tr.po
index 6c95121e80e..0678e1123f0 100644
--- a/addons/board_document/i18n/tr.po
+++ b/addons/board_document/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/uk.po b/addons/board_document/i18n/uk.po
index d3079b41be5..d1febd81251 100644
--- a/addons/board_document/i18n/uk.po
+++ b/addons/board_document/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/zh_CN.po b/addons/board_document/i18n/zh_CN.po
index 72ebaf6f46c..0f5c8069b69 100644
--- a/addons/board_document/i18n/zh_CN.po
+++ b/addons/board_document/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_document/i18n/zh_TW.po b/addons/board_document/i18n/zh_TW.po
index e710d5bb812..a9f84b8d521 100644
--- a/addons/board_document/i18n/zh_TW.po
+++ b/addons/board_document/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
diff --git a/addons/board_hr/__terp__.py b/addons/board_hr/__openerp__.py
similarity index 100%
rename from addons/board_hr/__terp__.py
rename to addons/board_hr/__openerp__.py
diff --git a/addons/board_hr/board_hr_view.xml b/addons/board_hr/board_hr_view.xml
index 2e84eff0749..710a6d88b4a 100644
--- a/addons/board_hr/board_hr_view.xml
+++ b/addons/board_hr/board_hr_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	    <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="menu_hr_deshboard"
             name="Human Resources"
diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__openerp__.py
similarity index 100%
rename from addons/board_manufacturing/__terp__.py
rename to addons/board_manufacturing/__openerp__.py
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index df4a6805afb..17b4bc486bc 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -15,7 +15,7 @@
                         <child1>
                             <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
                             <action colspan="4" name="%(stock.action_picking_all)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
-                            <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string="	Requisition in Exception"/>
+                            <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string="Procurements in Exception"/>
                         </child1>
 
 
@@ -37,7 +37,7 @@
             <field name="view_id" ref="board_mrp_manager_form"/>
         </record>
 
-   		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="next_id_87"
             name="Production"
diff --git a/addons/board_manufacturing/i18n/ar.po b/addons/board_manufacturing/i18n/ar.po
index 6864a7b86f9..ada107afcbf 100644
--- a/addons/board_manufacturing/i18n/ar.po
+++ b/addons/board_manufacturing/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/bg.po b/addons/board_manufacturing/i18n/bg.po
index f07505dfaef..fb3cf14c4d4 100644
--- a/addons/board_manufacturing/i18n/bg.po
+++ b/addons/board_manufacturing/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/bs.po b/addons/board_manufacturing/i18n/bs.po
index 5cd347ad9cf..ff9fad6d849 100644
--- a/addons/board_manufacturing/i18n/bs.po
+++ b/addons/board_manufacturing/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/ca.po b/addons/board_manufacturing/i18n/ca.po
index 80ccf85e163..2edb4b14620 100644
--- a/addons/board_manufacturing/i18n/ca.po
+++ b/addons/board_manufacturing/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/cs.po b/addons/board_manufacturing/i18n/cs.po
index 6864a7b86f9..ada107afcbf 100644
--- a/addons/board_manufacturing/i18n/cs.po
+++ b/addons/board_manufacturing/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/de.po b/addons/board_manufacturing/i18n/de.po
index 4504671eb4d..f5b9ad4bcb4 100644
--- a/addons/board_manufacturing/i18n/de.po
+++ b/addons/board_manufacturing/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/el.po b/addons/board_manufacturing/i18n/el.po
index eff89310447..ed6008f3328 100644
--- a/addons/board_manufacturing/i18n/el.po
+++ b/addons/board_manufacturing/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_manufacturing/i18n/es.po b/addons/board_manufacturing/i18n/es.po
index c7c01c83ef4..b7ff8d8f713 100644
--- a/addons/board_manufacturing/i18n/es.po
+++ b/addons/board_manufacturing/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/es_AR.po b/addons/board_manufacturing/i18n/es_AR.po
index 3e011c0147c..dd6f49c9719 100644
--- a/addons/board_manufacturing/i18n/es_AR.po
+++ b/addons/board_manufacturing/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/et.po b/addons/board_manufacturing/i18n/et.po
index 1e21e65978f..09aee2d5b1d 100644
--- a/addons/board_manufacturing/i18n/et.po
+++ b/addons/board_manufacturing/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/fr.po b/addons/board_manufacturing/i18n/fr.po
index 7de21abc122..d583b34c136 100644
--- a/addons/board_manufacturing/i18n/fr.po
+++ b/addons/board_manufacturing/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/gl.po b/addons/board_manufacturing/i18n/gl.po
index 66529a0a893..1c4149c877b 100644
--- a/addons/board_manufacturing/i18n/gl.po
+++ b/addons/board_manufacturing/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/hr.po b/addons/board_manufacturing/i18n/hr.po
index 3a32e8f6396..2d542ab7a13 100644
--- a/addons/board_manufacturing/i18n/hr.po
+++ b/addons/board_manufacturing/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/hu.po b/addons/board_manufacturing/i18n/hu.po
index 6864a7b86f9..ada107afcbf 100644
--- a/addons/board_manufacturing/i18n/hu.po
+++ b/addons/board_manufacturing/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/id.po b/addons/board_manufacturing/i18n/id.po
index dbf685ed526..f0cc689f317 100644
--- a/addons/board_manufacturing/i18n/id.po
+++ b/addons/board_manufacturing/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/it.po b/addons/board_manufacturing/i18n/it.po
index e32f74b1fcc..aa085806766 100644
--- a/addons/board_manufacturing/i18n/it.po
+++ b/addons/board_manufacturing/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/ko.po b/addons/board_manufacturing/i18n/ko.po
index 6674329cca8..c4c9b506e73 100644
--- a/addons/board_manufacturing/i18n/ko.po
+++ b/addons/board_manufacturing/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/lt.po b/addons/board_manufacturing/i18n/lt.po
index 6864a7b86f9..ada107afcbf 100644
--- a/addons/board_manufacturing/i18n/lt.po
+++ b/addons/board_manufacturing/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/nl.po b/addons/board_manufacturing/i18n/nl.po
index ed240cd9253..ff549ec53ab 100644
--- a/addons/board_manufacturing/i18n/nl.po
+++ b/addons/board_manufacturing/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/nl_BE.po b/addons/board_manufacturing/i18n/nl_BE.po
index 369614b90a1..4cff8481b1c 100644
--- a/addons/board_manufacturing/i18n/nl_BE.po
+++ b/addons/board_manufacturing/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/pl.po b/addons/board_manufacturing/i18n/pl.po
index a5193bae6ec..26654a8a158 100644
--- a/addons/board_manufacturing/i18n/pl.po
+++ b/addons/board_manufacturing/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/pt.po b/addons/board_manufacturing/i18n/pt.po
index 29b272aa17b..5fa1fdb501d 100644
--- a/addons/board_manufacturing/i18n/pt.po
+++ b/addons/board_manufacturing/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/pt_BR.po b/addons/board_manufacturing/i18n/pt_BR.po
index da368697a69..1101f85407f 100644
--- a/addons/board_manufacturing/i18n/pt_BR.po
+++ b/addons/board_manufacturing/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/ro.po b/addons/board_manufacturing/i18n/ro.po
index 9fed4542f5c..394df43ae51 100644
--- a/addons/board_manufacturing/i18n/ro.po
+++ b/addons/board_manufacturing/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/ru.po b/addons/board_manufacturing/i18n/ru.po
index 23925d042f8..d7ac2d1156e 100644
--- a/addons/board_manufacturing/i18n/ru.po
+++ b/addons/board_manufacturing/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2008-11-04 11:49+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-04-19 09:39+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
@@ -34,7 +34,7 @@ msgstr "Неправильный XML для просмотра архитект
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Deliveries (Out packing)"
-msgstr ""
+msgstr "Поставки(Исходящие)"
 
 #. module: board_manufacturing
 #: view:board.board:0
@@ -49,7 +49,7 @@ msgstr "Производство"
 #. module: board_manufacturing
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: board_manufacturing
 #: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
@@ -60,7 +60,7 @@ msgstr "Панель аналитики производства"
 #. module: board_manufacturing
 #: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information
 msgid "Board for manufacturing"
-msgstr ""
+msgstr "Панель для производства"
 
 #. module: board_manufacturing
 #: view:board.board:0
@@ -70,4 +70,4 @@ msgstr "Изменения оценки запасов"
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Workcenter futur load"
-msgstr ""
+msgstr "Загрузка мощности в будущем"
diff --git a/addons/board_manufacturing/i18n/sl.po b/addons/board_manufacturing/i18n/sl.po
index a7f1041d05c..0620584db39 100644
--- a/addons/board_manufacturing/i18n/sl.po
+++ b/addons/board_manufacturing/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/sv.po b/addons/board_manufacturing/i18n/sv.po
index 705729fc0b0..f0201cf4983 100644
--- a/addons/board_manufacturing/i18n/sv.po
+++ b/addons/board_manufacturing/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/tlh.po b/addons/board_manufacturing/i18n/tlh.po
index 05603846041..9c1afb86e8d 100644
--- a/addons/board_manufacturing/i18n/tlh.po
+++ b/addons/board_manufacturing/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/tr.po b/addons/board_manufacturing/i18n/tr.po
index 95d40a6d02b..c395ff2fc68 100644
--- a/addons/board_manufacturing/i18n/tr.po
+++ b/addons/board_manufacturing/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/uk.po b/addons/board_manufacturing/i18n/uk.po
index b3de2db2175..c4d2f572791 100644
--- a/addons/board_manufacturing/i18n/uk.po
+++ b/addons/board_manufacturing/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/zh_CN.po b/addons/board_manufacturing/i18n/zh_CN.po
index e798ea2f680..f643c9da509 100644
--- a/addons/board_manufacturing/i18n/zh_CN.po
+++ b/addons/board_manufacturing/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_manufacturing/i18n/zh_TW.po b/addons/board_manufacturing/i18n/zh_TW.po
index 7296abefad3..bc137396745 100644
--- a/addons/board_manufacturing/i18n/zh_TW.po
+++ b/addons/board_manufacturing/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
diff --git a/addons/board_project/__terp__.py b/addons/board_project/__openerp__.py
similarity index 100%
rename from addons/board_project/__terp__.py
rename to addons/board_project/__openerp__.py
diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index 893a3a7df68..f22a2acde55 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -7,8 +7,8 @@
         </record>
 
         <!--
-		 Board for project managers
-		 -->
+         Board for project managers
+         -->
         <act_window domain="[('manager', '=', uid)]" id="act_my_project" name="My projects" res_model="project.project" view_mode="tree,form" view_type="form"/>
 
         <act_window domain="[('user_id','=',uid),('state','&lt;&gt;','close')]" id="act_my_account" name="My accounts to invoice" res_model="account.analytic.account" view_id="view_account_analytic_simplified" view_mode="tree,form" view_type="form"/>
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index fc79b0f9304..231aebdb110 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -64,7 +64,7 @@
             <field name="domain">[('type','=','Project')]</field>
         </record>
 
-		<!--Actions for deshboard -->
+        <!--Actions for deshboard -->
 
         <record id="action_view_project_editable_messages_tree" model="ir.actions.act_window">
             <field name="name">Messages</field>
@@ -112,7 +112,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_form"/>
         </record>
-		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
             id="next_id_86"
             name="Project"
diff --git a/addons/board_project/i18n/ar.po b/addons/board_project/i18n/ar.po
index 1bbc7117ee6..5b913212268 100644
--- a/addons/board_project/i18n/ar.po
+++ b/addons/board_project/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/bg.po b/addons/board_project/i18n/bg.po
index 7092cddc583..b934e51eb30 100644
--- a/addons/board_project/i18n/bg.po
+++ b/addons/board_project/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/bs.po b/addons/board_project/i18n/bs.po
index 57d50d56019..ffcc0db7aac 100644
--- a/addons/board_project/i18n/bs.po
+++ b/addons/board_project/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/ca.po b/addons/board_project/i18n/ca.po
index 094388946ca..f49a6cf1868 100644
--- a/addons/board_project/i18n/ca.po
+++ b/addons/board_project/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/cs.po b/addons/board_project/i18n/cs.po
index 1bbc7117ee6..5b913212268 100644
--- a/addons/board_project/i18n/cs.po
+++ b/addons/board_project/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/de.po b/addons/board_project/i18n/de.po
index b279ac0f835..6a7cad00634 100644
--- a/addons/board_project/i18n/de.po
+++ b/addons/board_project/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/el.po b/addons/board_project/i18n/el.po
index 3d02c37a6b5..f463a4395a9 100644
--- a/addons/board_project/i18n/el.po
+++ b/addons/board_project/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_project/i18n/es.po b/addons/board_project/i18n/es.po
index 6ba6ce27d48..7718cb76f44 100644
--- a/addons/board_project/i18n/es.po
+++ b/addons/board_project/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/es_AR.po b/addons/board_project/i18n/es_AR.po
index 96c09ba2aac..d9813b582b2 100644
--- a/addons/board_project/i18n/es_AR.po
+++ b/addons/board_project/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/et.po b/addons/board_project/i18n/et.po
index 626f7a9e8a3..d1f0cc4ae19 100644
--- a/addons/board_project/i18n/et.po
+++ b/addons/board_project/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/fa.po b/addons/board_project/i18n/fa.po
index 8348ee66f6e..8b6af3e15b6 100644
--- a/addons/board_project/i18n/fa.po
+++ b/addons/board_project/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/fr.po b/addons/board_project/i18n/fr.po
index c45ef58fd35..291ca69fb0b 100644
--- a/addons/board_project/i18n/fr.po
+++ b/addons/board_project/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/hr.po b/addons/board_project/i18n/hr.po
index 537b2a14270..2c54e0042b8 100644
--- a/addons/board_project/i18n/hr.po
+++ b/addons/board_project/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/hu.po b/addons/board_project/i18n/hu.po
index 1bbc7117ee6..5b913212268 100644
--- a/addons/board_project/i18n/hu.po
+++ b/addons/board_project/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/id.po b/addons/board_project/i18n/id.po
index 1cac7be697c..ca8995c33fd 100644
--- a/addons/board_project/i18n/id.po
+++ b/addons/board_project/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/it.po b/addons/board_project/i18n/it.po
index 6219ecced78..78d95858d8c 100644
--- a/addons/board_project/i18n/it.po
+++ b/addons/board_project/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/ko.po b/addons/board_project/i18n/ko.po
index bb1fa9bdeb3..810ac181891 100644
--- a/addons/board_project/i18n/ko.po
+++ b/addons/board_project/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/lt.po b/addons/board_project/i18n/lt.po
index af82bb8653f..0cd2f252cb6 100644
--- a/addons/board_project/i18n/lt.po
+++ b/addons/board_project/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/nl.po b/addons/board_project/i18n/nl.po
index bb64a95e382..362a3ee556b 100644
--- a/addons/board_project/i18n/nl.po
+++ b/addons/board_project/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/nl_BE.po b/addons/board_project/i18n/nl_BE.po
index b6a8ed0fe0c..dec1ef11200 100644
--- a/addons/board_project/i18n/nl_BE.po
+++ b/addons/board_project/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/pl.po b/addons/board_project/i18n/pl.po
index a228cdee36b..23bca5480cc 100644
--- a/addons/board_project/i18n/pl.po
+++ b/addons/board_project/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/pt.po b/addons/board_project/i18n/pt.po
index d99138be082..dd438d46c28 100644
--- a/addons/board_project/i18n/pt.po
+++ b/addons/board_project/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/pt_BR.po b/addons/board_project/i18n/pt_BR.po
index 3ea67356454..6a560b7b4ed 100644
--- a/addons/board_project/i18n/pt_BR.po
+++ b/addons/board_project/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/ro.po b/addons/board_project/i18n/ro.po
index 4bc0872a5c9..dcc14741f34 100644
--- a/addons/board_project/i18n/ro.po
+++ b/addons/board_project/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/ru.po b/addons/board_project/i18n/ru.po
index da870866b24..270fd91aa06 100644
--- a/addons/board_project/i18n/ru.po
+++ b/addons/board_project/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/sl.po b/addons/board_project/i18n/sl.po
index 9e42c1de263..46d6128e6d3 100644
--- a/addons/board_project/i18n/sl.po
+++ b/addons/board_project/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/sv.po b/addons/board_project/i18n/sv.po
index 9eee2ad050b..8c5d7090a39 100644
--- a/addons/board_project/i18n/sv.po
+++ b/addons/board_project/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/tlh.po b/addons/board_project/i18n/tlh.po
index e3b54635e9e..e25f2629228 100644
--- a/addons/board_project/i18n/tlh.po
+++ b/addons/board_project/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/tr.po b/addons/board_project/i18n/tr.po
index c5a19bc0c4d..958cb246cb9 100644
--- a/addons/board_project/i18n/tr.po
+++ b/addons/board_project/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/uk.po b/addons/board_project/i18n/uk.po
index a97b7713e22..26917344333 100644
--- a/addons/board_project/i18n/uk.po
+++ b/addons/board_project/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/zh_CN.po b/addons/board_project/i18n/zh_CN.po
index a316b21a815..d6a2ad02e7e 100644
--- a/addons/board_project/i18n/zh_CN.po
+++ b/addons/board_project/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_project/i18n/zh_TW.po b/addons/board_project/i18n/zh_TW.po
index 9f56ee7e3f4..9a77e0f81ce 100644
--- a/addons/board_project/i18n/zh_TW.po
+++ b/addons/board_project/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
diff --git a/addons/board_sale/__terp__.py b/addons/board_sale/__openerp__.py
similarity index 100%
rename from addons/board_sale/__terp__.py
rename to addons/board_sale/__openerp__.py
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index 509bcb5428b..c58a4983185 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -5,24 +5,24 @@
             <field name="name">Sales</field>
         </record>
 
-		<record model="ir.actions.act_window" id="board_crm_case_categ_phone_incoming0">
-	        <field name="res_model">crm.phonecall</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,calendar</field>
-	        <field name="view_id" ref="crm.crm_case_phone_tree_view"/>
-	        <field name="domain">[('user_id','=',uid)]</field>
-	        <field name="context" eval="{'default_state':'open'}"/>
-	        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
-	    </record>
+        <record model="ir.actions.act_window" id="board_crm_case_categ_phone_incoming0">
+            <field name="res_model">crm.phonecall</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar</field>
+            <field name="view_id" ref="crm.crm_case_phone_tree_view"/>
+            <field name="domain">[('user_id','=',uid)]</field>
+            <field name="context" eval="{'default_state':'open'}"/>
+            <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
+        </record>
 
-		<record model="ir.actions.act_window" id="board_crm_case_categ_meet">
-	        <field name="res_model">crm.meeting</field>
-	        <field name="view_mode">tree,form,gantt</field>
-	        <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
-	        <field name="domain">[('user_id','=',uid)]</field>
-	        <field name="domain">[('date','&gt;=',time.strftime('%Y-%m-%d')),('date','&lt;=',(datetime.datetime.today() + datetime.timedelta(days=2)).strftime('%Y-%m-%d'))]</field>
-	        <field name="context" eval="{'default_state':'open'}"/>
-	    </record>
+        <record model="ir.actions.act_window" id="board_crm_case_categ_meet">
+            <field name="res_model">crm.meeting</field>
+            <field name="view_mode">tree,form,gantt</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
+            <field name="domain">[('user_id','=',uid)]</field>
+            <field name="domain">[('date','&gt;=',time.strftime('%Y-%m-%d')),('date','&lt;=',(datetime.datetime.today() + datetime.timedelta(days=2)).strftime('%Y-%m-%d'))]</field>
+            <field name="context" eval="{'default_state':'open'}"/>
+        </record>
         <record id="board_sales_manager_form" model="ir.ui.view">
             <field name="name">board.sales.manager.form</field>
             <field name="model">board.board</field>
@@ -36,8 +36,8 @@
                         </child1>
 
                         <child2>
-							<action colspan="4" name="%(crm.crm_case_category_act_oppor11)d" string="My Opportunities" width="510" domain="[('user_id','=',uid)]"/>
-							<action colspan="4" name="%(board_crm_case_categ_meet)d" String="My Meetings" domain="[('state','=','open')]" width="510"/>
+                            <action colspan="4" name="%(crm.crm_case_category_act_oppor11)d" string="My Opportunities" width="510" domain="[('user_id','=',uid)]"/>
+                            <action colspan="4" name="%(board_crm_case_categ_meet)d" String="My Meetings" domain="[('state','=','open')]" width="510"/>
                         </child2>
                     </hpaned>
                 </form>
@@ -52,7 +52,7 @@
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
 
-		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem id="next_id_88" name="Sales" parent="base.dashboard"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
 
     </data>
diff --git a/addons/board_sale/i18n/ar.po b/addons/board_sale/i18n/ar.po
index 7b3b45d32ef..79857cec481 100644
--- a/addons/board_sale/i18n/ar.po
+++ b/addons/board_sale/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/bg.po b/addons/board_sale/i18n/bg.po
index 7c5bfa72b47..673e06fb9a8 100644
--- a/addons/board_sale/i18n/bg.po
+++ b/addons/board_sale/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/bs.po b/addons/board_sale/i18n/bs.po
index c074f90c313..c547fbc3a55 100644
--- a/addons/board_sale/i18n/bs.po
+++ b/addons/board_sale/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/ca.po b/addons/board_sale/i18n/ca.po
index 5f1fe5ef0d6..81488aa7339 100644
--- a/addons/board_sale/i18n/ca.po
+++ b/addons/board_sale/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/cs.po b/addons/board_sale/i18n/cs.po
index 7cfbfcab5da..80cbc0c2095 100644
--- a/addons/board_sale/i18n/cs.po
+++ b/addons/board_sale/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/de.po b/addons/board_sale/i18n/de.po
index 22acc60864e..61f56b1d0c1 100644
--- a/addons/board_sale/i18n/de.po
+++ b/addons/board_sale/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/el.po b/addons/board_sale/i18n/el.po
index e2749ee77cb..8801deebc3d 100644
--- a/addons/board_sale/i18n/el.po
+++ b/addons/board_sale/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board_sale/i18n/es.po b/addons/board_sale/i18n/es.po
index 906d7885bfb..7d6ae348f3d 100644
--- a/addons/board_sale/i18n/es.po
+++ b/addons/board_sale/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/es_AR.po b/addons/board_sale/i18n/es_AR.po
index 9d5cdad859d..ba1eb4da9fe 100644
--- a/addons/board_sale/i18n/es_AR.po
+++ b/addons/board_sale/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/et.po b/addons/board_sale/i18n/et.po
index 7f9feba17dc..5059b535147 100644
--- a/addons/board_sale/i18n/et.po
+++ b/addons/board_sale/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/fr.po b/addons/board_sale/i18n/fr.po
index 6dc578cac6b..7e56f0d7ffc 100644
--- a/addons/board_sale/i18n/fr.po
+++ b/addons/board_sale/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/gl.po b/addons/board_sale/i18n/gl.po
index 65a8762b205..ec5d8e58b25 100644
--- a/addons/board_sale/i18n/gl.po
+++ b/addons/board_sale/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/hr.po b/addons/board_sale/i18n/hr.po
index 46ae5146152..90a9f5b03e1 100644
--- a/addons/board_sale/i18n/hr.po
+++ b/addons/board_sale/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/hu.po b/addons/board_sale/i18n/hu.po
index 159dc8f923e..76b98210c0e 100644
--- a/addons/board_sale/i18n/hu.po
+++ b/addons/board_sale/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/id.po b/addons/board_sale/i18n/id.po
index 02c72525f83..91fc6f78a47 100644
--- a/addons/board_sale/i18n/id.po
+++ b/addons/board_sale/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/it.po b/addons/board_sale/i18n/it.po
index 4782d9394c6..16662f3262d 100644
--- a/addons/board_sale/i18n/it.po
+++ b/addons/board_sale/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/ko.po b/addons/board_sale/i18n/ko.po
index 1f177b585be..c2005ed7a24 100644
--- a/addons/board_sale/i18n/ko.po
+++ b/addons/board_sale/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/lt.po b/addons/board_sale/i18n/lt.po
index 7b3b45d32ef..79857cec481 100644
--- a/addons/board_sale/i18n/lt.po
+++ b/addons/board_sale/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/nl.po b/addons/board_sale/i18n/nl.po
index 62d060a58e6..a274edba9bb 100644
--- a/addons/board_sale/i18n/nl.po
+++ b/addons/board_sale/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/nl_BE.po b/addons/board_sale/i18n/nl_BE.po
index e7acadd1a60..0d9173f74e6 100644
--- a/addons/board_sale/i18n/nl_BE.po
+++ b/addons/board_sale/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/pl.po b/addons/board_sale/i18n/pl.po
index 4bc84deb95d..c94742de09e 100644
--- a/addons/board_sale/i18n/pl.po
+++ b/addons/board_sale/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/pt.po b/addons/board_sale/i18n/pt.po
index ca19c1b2388..9ab3df7d0d9 100644
--- a/addons/board_sale/i18n/pt.po
+++ b/addons/board_sale/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/pt_BR.po b/addons/board_sale/i18n/pt_BR.po
index 4d93927e23e..ca69c67d220 100644
--- a/addons/board_sale/i18n/pt_BR.po
+++ b/addons/board_sale/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/ro.po b/addons/board_sale/i18n/ro.po
index 218b372b3b3..2901958f5c9 100644
--- a/addons/board_sale/i18n/ro.po
+++ b/addons/board_sale/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/ru.po b/addons/board_sale/i18n/ru.po
index ff21bd37042..8d038adc8a7 100644
--- a/addons/board_sale/i18n/ru.po
+++ b/addons/board_sale/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-28 07:55+0000\n"
-"Last-Translator: Artem Karimov <skybon@gmail.com>\n"
+"PO-Revision-Date: 2010-04-19 09:44+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
 #: model:ir.module.module,shortdesc:board_sale.module_meta_information
 msgid "Dashboard for sales"
-msgstr ""
+msgstr "Панель для продаж"
 
 #. module: board_sale
 #: model:ir.actions.act_window,name:board_sale.open_board_sales_manager
@@ -40,7 +40,7 @@ msgstr "Панель менеджера продаж"
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases of the month"
-msgstr ""
+msgstr "Случаи месяца"
 
 #. module: board_sale
 #: constraint:ir.ui.view:0
@@ -55,7 +55,7 @@ msgstr "Мои незакрытые предложения"
 #. module: board_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: board_sale
 #: model:ir.ui.menu,name:board_sale.next_id_88
@@ -65,7 +65,7 @@ msgstr "Продажи"
 #. module: board_sale
 #: view:board.board:0
 msgid "Cases statistics"
-msgstr ""
+msgstr "Статистика случаев"
 
 #. module: board_sale
 #: view:board.board:0
diff --git a/addons/board_sale/i18n/sl.po b/addons/board_sale/i18n/sl.po
index d5d2b870533..ed49dad068e 100644
--- a/addons/board_sale/i18n/sl.po
+++ b/addons/board_sale/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/sv.po b/addons/board_sale/i18n/sv.po
index 861a02d5693..d528e7ffa5e 100644
--- a/addons/board_sale/i18n/sv.po
+++ b/addons/board_sale/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/tlh.po b/addons/board_sale/i18n/tlh.po
index 36fc3ad9b47..dd910e33ee5 100644
--- a/addons/board_sale/i18n/tlh.po
+++ b/addons/board_sale/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/tr.po b/addons/board_sale/i18n/tr.po
index 90ec4f2a50f..ce95de8849e 100644
--- a/addons/board_sale/i18n/tr.po
+++ b/addons/board_sale/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/uk.po b/addons/board_sale/i18n/uk.po
index 6273c407a5c..8642d445678 100644
--- a/addons/board_sale/i18n/uk.po
+++ b/addons/board_sale/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/zh_CN.po b/addons/board_sale/i18n/zh_CN.po
index 152661489ab..c819d61bbbc 100644
--- a/addons/board_sale/i18n/zh_CN.po
+++ b/addons/board_sale/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_sale/i18n/zh_TW.po b/addons/board_sale/i18n/zh_TW.po
index f2a577f0d29..e71928b2b68 100644
--- a/addons/board_sale/i18n/zh_TW.po
+++ b/addons/board_sale/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
diff --git a/addons/board_warehouse/__terp__.py b/addons/board_warehouse/__openerp__.py
similarity index 100%
rename from addons/board_warehouse/__terp__.py
rename to addons/board_warehouse/__openerp__.py
diff --git a/addons/caldav/__terp__.py b/addons/caldav/__openerp__.py
similarity index 100%
rename from addons/caldav/__terp__.py
rename to addons/caldav/__openerp__.py
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index f43328ecc3e..a477eeb282d 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
+    <data>
 
-		<record id="view_calendar_form" model="ir.ui.view">
-			<field name="name">Basic Calendar</field>
-			<field name="model">basic.calendar</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Basic Calendar">
-					<field name="name" required="1" select="1" />
-					<field name="active" select="1" />
+        <record id="view_calendar_form" model="ir.ui.view">
+            <field name="name">Basic Calendar</field>
+            <field name="model">basic.calendar</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Basic Calendar">
+                    <field name="name" required="1" select="1" />
+                    <field name="active" select="1" />
                     <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
-					    <form string="Calendar Lines">
-					        <field name="name" required="1" select="1" />
-					        <field name="object_id" required="1" select="1" />
-					        <field name="domain" select="1" />
-					        <field name="mapping_ids" select="1" colspan="4" nolabel="1">
-						        <tree string="Attributes Mapping" editable="bottom">
-							        <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
-							        <field name="fn" select="1" />
-							        <field name="field_id" select="1" required="1" domain="[('model_id', '=', parent.object_id)]" />
-							        <field name="expr" />
-						        </tree>
-						        <form string="Attributes Mapping">
-							        <field name="name" select="1" required="1" domain="[('type', '=', parent.name)]"/>
-							        <field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]"
-								        required="1" />
-							        <field name="fn" select="1" required="1" />
-							        <field name="expr" />
-							        <separator string="Value Mapping" colspan="4" />
-							        <field name="mapping" select="1" colspan="4" nolabel="1" />
-						        </form>
-					       </field>
-				        </form>
+                        <form string="Calendar Lines">
+                            <field name="name" required="1" select="1" />
+                            <field name="object_id" required="1" select="1" />
+                            <field name="domain" select="1" />
+                            <field name="mapping_ids" select="1" colspan="4" nolabel="1">
+                                <tree string="Attributes Mapping" editable="bottom">
+                                    <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
+                                    <field name="fn" select="1" />
+                                    <field name="field_id" select="1" required="1" domain="[('model_id', '=', parent.object_id)]" />
+                                    <field name="expr" />
+                                </tree>
+                                <form string="Attributes Mapping">
+                                    <field name="name" select="1" required="1" domain="[('type', '=', parent.name)]"/>
+                                    <field name="field_id" select="1" domain="[('model_id', '=', parent.object_id)]"
+                                        required="1" />
+                                    <field name="fn" select="1" required="1" />
+                                    <field name="expr" />
+                                    <separator string="Value Mapping" colspan="4" />
+                                    <field name="mapping" select="1" colspan="4" nolabel="1" />
+                                </form>
+                           </field>
+                        </form>
                         <tree string="Attributes Mapping" editable="bottom">
-					        <field name="name" select="1" />
-					        <field name="object_id" select="1" />
-				        </tree>
+                            <field name="name" select="1" />
+                            <field name="object_id" select="1" />
+                        </tree>
                     </field>
-				</form>
-			</field>
-		</record>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_view_calendar" model="ir.actions.act_window">
+        <record id="action_view_calendar" model="ir.actions.act_window">
             <field name="name">Calendar</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">basic.calendar</field>
@@ -50,12 +50,12 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-		<menuitem id="base.menu_calendar_configuration" name="Calendar"
-			parent="base.menu_base_config" sequence="10" />
+        <menuitem id="base.menu_calendar_configuration" name="Calendar"
+            parent="base.menu_base_config" sequence="10" />
 
-		<menuitem id="menu_calendar"
-			name="Calendar" parent="base.menu_calendar_configuration"
-			sequence="5" action="action_view_calendar" />
+        <menuitem id="menu_calendar"
+            name="Calendar" parent="base.menu_calendar_configuration"
+            sequence="5" action="action_view_calendar" />
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/crm/__terp__.py b/addons/crm/__openerp__.py
similarity index 86%
rename from addons/crm/__terp__.py
rename to addons/crm/__openerp__.py
index f84d5bd5b69..b3e45a33978 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__openerp__.py
@@ -44,21 +44,24 @@ The CRM module has a email gateway for the synchronisation interface
 between mails and Open ERP.""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'base_action_rule',
-                        'process',
-                        'mail_gateway',
-                        'base_calendar',
-                        'resource',
-                    ],
-    'init_xml': ['crm_data.xml',
-                'crm_meeting_data.xml',
-                 'crm_claims_data.xml',
-                 'crm_fund_data.xml',
-                 'crm_helpdesk_data.xml',
-                 'crm_lead_data.xml',
-                 'crm_meeting_data.xml',
-                 'crm_opportunity_data.xml',
-                 'crm_phonecall_data.xml',
+    'depends': [
+        'base', 
+        'base_action_rule',
+        'process',
+        'mail_gateway',
+        'base_calendar',
+        'resource',
+    ],
+    'init_xml': [
+        'crm_data.xml',
+        'crm_meeting_data.xml',
+         'crm_claims_data.xml',
+         'crm_fund_data.xml',
+         'crm_helpdesk_data.xml',
+         'crm_lead_data.xml',
+         'crm_meeting_data.xml',
+         'crm_opportunity_data.xml',
+         'crm_phonecall_data.xml',
     ],
 
     'update_xml': [
@@ -104,7 +107,6 @@ between mails and Open ERP.""",
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
-
     ],
     'demo_xml': [
         'crm_demo.xml',
@@ -114,7 +116,8 @@ between mails and Open ERP.""",
         'crm_lead_demo.xml',
         'crm_meeting_demo.xml',
         'crm_opportunity_demo.xml',
-        'crm_phonecall_demo.xml'],
+        'crm_phonecall_demo.xml'
+    ],
     'installable': True,
     'active': False,
     'certificate': '0079056041421',
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 81b6cc79f35..adfbf0ca772 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -30,49 +30,51 @@ from tools.translate import _
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
-    ('draft', 'Draft'),
-    ('open', 'Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
+    ('draft', 'Draft'), 
+    ('open', 'Open'), 
+    ('cancel', 'Cancelled'), 
+    ('done', 'Closed'), 
     ('pending', 'Pending')
 ]
 
 AVAILABLE_PRIORITIES = [
-    ('5', 'Lowest'),
-    ('4', 'Low'),
-    ('3', 'Normal'),
-    ('2', 'High'),
+    ('5', 'Lowest'), 
+    ('4', 'Low'), 
+    ('3', 'Normal'), 
+    ('2', 'High'), 
     ('1', 'Highest')
 ]
 
 class crm_case_section(osv.osv):
-    """ Cases Section"""
+    """Sales Team"""
 
     _name = "crm.case.section"
     _description = "Sales Teams"
     _order = "name"
 
     _columns = {
-        'name': fields.char('Sales Team', size=64, required=True, translate=True),
-        'code': fields.char('Code', size=8),
+        'name': fields.char('Sales Team', size=64, required=True, translate=True), 
+        'code': fields.char('Code', size=8), 
         'active': fields.boolean('Active', help="If the active field is set to \
-                        true, it will allow you to hide the sales team without removing it."),
-        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
-        'user_id': fields.many2one('res.users', 'Responsible User'),
+                        true, it will allow you to hide the sales team without removing it."), 
+        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"), 
+        'user_id': fields.many2one('res.users', 'Responsible User'), 
         'reply_to': fields.char('Reply-To', size=64, help="The email address put \
                         in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
-        'parent_id': fields.many2one('crm.case.section', 'Parent Section'),
-        'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'),
+        'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
+        'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
         'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
+        'server_id':fields.many2one('email.smtpclient', 'Server ID'),
+        'note': fields.text('Description'),
     }
 
     _defaults = {
-        'active': lambda *a: 1,
-        'allow_unlink': lambda *a: 1,
+        'active': lambda *a: 1, 
+        'allow_unlink': lambda *a: 1, 
     }
 
     _sql_constraints = [
-        ('code_uniq', 'unique (code)', 'The code of the section must be unique !')
+        ('code_uniq', 'unique (code)', 'The code of the sales team must be unique !')
     ]
 
     def _check_recursion(self, cr, uid, ids):
@@ -98,18 +100,20 @@ class crm_case_section(osv.osv):
         (_check_recursion, 'Error ! You cannot create recursive sections.', ['parent_id'])
     ]
 
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         """Overrides orm name_get method
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of section ids
         """
+        if not context:
+            context = {}
 
-        if not len(ids):
-            return []
-        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
         res = []
+        if not ids:
+            return res
+        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
 
         for record in reads:
             name = record['name']
@@ -117,6 +121,7 @@ class crm_case_section(osv.osv):
                 name = record['parent_id'][1] + ' / ' + name
             res.append((record['id'], name))
         return res
+
 crm_case_section()
 
 
@@ -127,13 +132,13 @@ class crm_case_categ(osv.osv):
     _description = "Category of case"
 
     _columns = {
-        'name': fields.char('Case Category Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'object_id': fields.many2one('ir.model', 'Object Name'),
+        'name': fields.char('Case Category Name', size=64, required=True, translate=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+        'object_id': fields.many2one('ir.model', 'Object Name'), 
     }
     def _find_object_id(self, cr, uid, context=None):
 
-        """
+        """Finds id for case object
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -147,7 +152,7 @@ class crm_case_categ(osv.osv):
     _defaults = {
         'object_id' : _find_object_id
     }
-#
+
 crm_case_categ()
 
 
@@ -159,19 +164,17 @@ class crm_case_resource_type(osv.osv):
     _rec_name = "name"
 
     _columns = {
-        'name': fields.char('Case Resource Type', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'object_id': fields.many2one('ir.model', 'Object Name'),
+        'name': fields.char('Case Resource Type', size=64, required=True, translate=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+        'object_id': fields.many2one('ir.model', 'Object Name'), 
     }
     def _find_object_id(self, cr, uid, context=None):
-        """
+        """Finds id for case object
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
-
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
@@ -192,46 +195,44 @@ class crm_case_stage(osv.osv):
     _order = "sequence"
 
     _columns = {
-        'name': fields.char('Stage Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'name': fields.char('Stage Name', size=64, required=True, translate=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
         'sequence': fields.integer('Sequence', help="Gives the sequence order \
-                        when displaying a list of case stages."),
-        'object_id': fields.many2one('ir.model', 'Object Name'),
-        'probability': fields.float('Probability (%)', required=True),
-        'on_change': fields.boolean('Change Probability Automatically',\
-                         help="Change Probability on next and previous stages."),
+                        when displaying a list of case stages."), 
+        'object_id': fields.many2one('ir.model', 'Object Name'), 
+        'probability': fields.float('Probability (%)', required=True), 
+        'on_change': fields.boolean('Change Probability Automatically', \
+                         help="Change Probability on next and previous stages."), 
         'requirements': fields.text('Requirements')
     }
     def _find_object_id(self, cr, uid, context=None):
-
-        """
+        """Finds id for case object
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
 
     _defaults = {
-        'sequence': lambda *args: 1,
-        'probability': lambda *args: 0.0,
+        'sequence': lambda *args: 1, 
+        'probability': lambda *args: 0.0, 
         'object_id' : _find_object_id
     }
 
 crm_case_stage()
 
-def _links_get(self, cr, uid, context={}):
+def _links_get(self, cr, uid, context=None):
+    """Gets links value for reference field
+    @param self: The object pointer
+    @param cr: the current row, from the database cursor,
+    @param uid: the current user’s ID for security checks,
+    @param context: A standard dictionary for contextual values
     """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-
-
+    if not context:
+        context = {}
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
@@ -244,16 +245,13 @@ class crm_case(osv.osv):
     _description = "Case"
 
     def _email_last(self, cursor, user, ids, name, arg, context=None):
-
-        """Return History
+        """Return last email from History
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of case’s IDs
         @param context: A standard dictionary for contextual values
         """
-
-
         res = {}
         for case in self.browse(cursor, user, ids):
             if case.history_line:
@@ -262,30 +260,31 @@ class crm_case(osv.osv):
                 res[case.id] = False
         return res
 
-    def copy(self, cr, uid, id, default=None, context={}):
-
-        """
+    def copy(self, cr, uid, id, default=None, context=None):
+        """Overrides orm copy method
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of case’s IDs
         @param context: A standard dictionary for contextual values
         """
-
+        if not context:
+            context = {}
         if not default:
             default = {}
         default.update({'state': 'draft', 'id': False})
         return super(crm_case, self).copy(cr, uid, id, default, context)
 
-    def _get_log_ids(self, cr, uid, ids, field_names, arg, context={}):
-
-        """
+    def _get_log_ids(self, cr, uid, ids, field_names, arg, context=None):
+        """Gets id for case log from history of particular case
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case log’s IDs
+        @param ids: List of Case IDs
         @param context: A standard dictionary for contextual values
         """
+        if not context:
+            context = {}
 
         result = {}
         history_obj = False
@@ -304,7 +303,7 @@ class crm_case(osv.osv):
 
         for case in self.browse(cr, uid, ids, context):
             model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
-            history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]),\
+            history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]), \
                                          ('res_id', '=', case.id)])
             if history_ids:
                 result[case.id] = {name: history_ids}
@@ -314,64 +313,60 @@ class crm_case(osv.osv):
         return result
 
     _columns = {
-        'id': fields.integer('ID', readonly=True),
-        'name': fields.char('Description', size=1024, required=True),
+        'id': fields.integer('ID', readonly=True), 
+        'name': fields.char('Description', size=1024, required=True), 
         'active': fields.boolean('Active', help="If the active field is set to\
-                     true, it will allow you to hide the case without removing it."),
-        'description': fields.text('Description'),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team',\
+                     true, it will allow you to hide the case without removing it."), 
+        'description': fields.text('Description'), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'),
-        'email_from': fields.char('Email', size=128, help="These people will receive email."),
+                             Define Responsible user and Email account for mail gateway.'), 
+        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
         'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
                              will receive a copy of the future" \
-                            " communication between partner and users by email"),
-        'probability': fields.float('Probability'),
-        'email_last': fields.function(_email_last, method=True,
-            string='Latest E-Mail', type='text'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact',\
-                                 domain="[('partner_id','=',partner_id)]"),
-        'create_date': fields.datetime('Creation Date' , readonly=True),
-        'write_date': fields.datetime('Update Date' , readonly=True),
-        'date_deadline': fields.date('Deadline'),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-        'history_line': fields.function(_get_log_ids, method=True, type='one2many',\
-                         multi="history_line", relation="crm.case.history", string="Communication"),
-        'log_ids': fields.function(_get_log_ids, method=True, type='one2many',\
-                         multi="log_ids", relation="crm.case.log", string="Logs History"),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage',\
+                            " communication between partner and users by email"), 
+        'probability': fields.float('Probability'), 
+        'email_last': fields.function(_email_last, method=True, 
+            string='Latest E-Mail', type='text'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
+                                 domain="[('partner_id','=',partner_id)]"), 
+        'create_date': fields.datetime('Creation Date' , readonly=True), 
+        'write_date': fields.datetime('Update Date' , readonly=True), 
+        'date_deadline': fields.date('Deadline'), 
+        'user_id': fields.many2one('res.users', 'Responsible'), 
+        'history_line': fields.function(_get_log_ids, method=True, type='one2many', \
+                         multi="history_line", relation="crm.case.history", string="Communication"), 
+        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', \
+                         multi="log_ids", relation="crm.case.log", string="Logs History"), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
                          domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.opportunity')]"),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
+                        ('object_id.model', '=', 'crm.opportunity')]"), 
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
-                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-        'company_id': fields.many2one('res.company', 'Company'),
+                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
+        'company_id': fields.many2one('res.company', 'Company'), 
     }
     def _get_default_partner_address(self, cr, uid, context):
-
-        """
+        """Gives id of default address for current user
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         if not context.get('portal', False):
             return False
         return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
 
     def _get_default_partner(self, cr, uid, context):
-
-        """
+        """Gives id of partner for current user
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         if not context.get('portal', False):
             return False
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
@@ -380,14 +375,12 @@ class crm_case(osv.osv):
         return user.address_id.partner_id.id
 
     def _get_default_email(self, cr, uid, context):
-
-        """
+        """Gives default email address for current user
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         if not context.get('portal', False):
             return False
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
@@ -396,63 +389,66 @@ class crm_case(osv.osv):
         return user.address_id.email
 
     def _get_default_user(self, cr, uid, context):
-        """
+        """Gives current user id
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         if context.get('portal', False):
             return False
         return uid
 
     def _get_section(self, cr, uid, context):
-        """
+        """Gives section id for current User
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.context_section_id.id or False
 
     _defaults = {
-        'active': lambda *a: 1,
-        'user_id': _get_default_user,
-        'partner_id': _get_default_partner,
-        'partner_address_id': _get_default_partner_address,
-        'email_from': _get_default_email,
-        'state': lambda *a: 'draft',
-        'section_id': _get_section,
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
+        'active': lambda *a: 1, 
+        'user_id': _get_default_user, 
+        'partner_id': _get_default_partner, 
+        'partner_address_id': _get_default_partner_address, 
+        'email_from': _get_default_email, 
+        'state': lambda *a: 'draft', 
+        'section_id': _get_section, 
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), 
     }
 
     _order = 'date_deadline desc, create_date desc,id desc'
 
-    def unlink(self, cr, uid, ids, context={}):
-
-        """
+    def unlink(self, cr, uid, ids, context=None):
+        """Overrides orm unlink method
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case’s IDs
-        @param context: A standard dictionary for contextual values"""
+        @param ids: List of case IDs
+        @param context: A standard dictionary for contextual values
+        """
+        if not context:
+            context = {}
 
         for case in self.browse(cr, uid, ids, context):
             if (not case.section_id.allow_unlink) and (case.state <> 'draft'):
-                raise osv.except_osv(_('Warning !'),
+                raise osv.except_osv(_('Warning !'), 
                     _('You can not delete this case. You should better cancel it.'))
         return super(crm_case, self).unlink(cr, uid, ids, context)
 
-    def stage_next(self, cr, uid, ids, context={}):
-        """
+    def stage_next(self, cr, uid, ids, context=None):
+        """This function computes next stage for case from its current stage
+             using available stage for that case type 
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of stage next’s IDs
+        @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
 
         s = self.get_stage_dict(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
@@ -463,15 +459,17 @@ class crm_case(osv.osv):
                     self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
         return True
 
-    def get_stage_dict(self, cr, uid, ids, context={}):
-        """
+    def get_stage_dict(self, cr, uid, ids, context=None):
+        """This function gives dictionary for stage according to stage levels
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of stage dict’s IDs
+        @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
 
-        sid = self.pool.get('crm.case.stage').search(cr, uid,\
+        sid = self.pool.get('crm.case.stage').search(cr, uid, \
                             [('object_id.model', '=', self._name)], context=context)
         s = {}
         previous = {}
@@ -482,49 +480,44 @@ class crm_case(osv.osv):
             previous[section] = stage.id
         return s
 
-    def stage_previous(self, cr, uid, ids, context={}):
-        """
+    def stage_previous(self, cr, uid, ids, context=None):
+        """This function computes previous stage for case from its current stage
+             using available stage for that case type 
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of stage previous’s IDs
+        @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
 
         s = self.get_stage_dict(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
             section = (case.section_id.id or False)
 
             if section in s:
-                st = case.stage_id.id  or False
+                st = case.stage_id.id or False
                 s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
                 if st in s[section]:
                     self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
         return True
 
-    def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}):
+    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of History’s IDs
+        @param ids: List of Case ids
+        @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
+        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
+        @param email: Email address if any
+        @param details: Details of case history if any 
         @param context: A standard dictionary for contextual values"""
-
-        cases = self.browse(cr, uid, ids, context=context)
-        return self.__history(cr, uid, cases, keyword=keyword, \
-                               history=history, email=email, details=details, \
-                               context=context)
-
-    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, context={}):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of History’s IDs
-        @param context: A standard dictionary for contextual values"""
-
+        if not context:
+            context = {}
 
         model_obj = self.pool.get('ir.model')
-
+        obj = self.pool.get('crm.case.log')
         for case in cases:
             model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
             data = {
@@ -533,35 +526,35 @@ class crm_case(osv.osv):
                 'date': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'model_id' : model_ids and model_ids[0] or False,
                 'res_id': case.id,
-                'section_id': case.section_id.id
+                'section_id': case.section_id.id,
+                'message_id':message_id
             }
 
-            obj = self.pool.get('crm.case.log')
             if history:
                 obj = self.pool.get('crm.case.history')
                 data['description'] = details or case.description
                 data['email_to'] = email or \
                         (case.section_id and case.section_id.reply_to) or \
                         (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from',False)
+                            case.user_id.address_id.email) or tools.config.get('email_from', False)
                 data['email_from'] = email_from or \
                         (case.section_id and case.section_id.reply_to) or \
                         (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from',False)
+                            case.user_id.address_id.email) or tools.config.get('email_from', False)
             res = obj.create(cr, uid, data, context)
         return True
+    
     _history = __history
+    history = __history
 
     def create(self, cr, uid, *args, **argv):
-
-        """
+        """Overrides orm create method
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param *args: Give Tuple Value
-        @Paran **args: Give Dictionay of Keyword Value
+        @param *args: Tuple Value for additional Params
+        @param **argv: Dictionay of Keyword Params
         """
-
         res = super(crm_case, self).create(cr, uid, *args, **argv)
         cases = self.browse(cr, uid, [res])
         cases[0].state # to fill the browse record cache
@@ -569,97 +562,33 @@ class crm_case(osv.osv):
         return res
 
     def add_reply(self, cursor, user, ids, context=None):
-
-        """
+        """This function finds last email and gives its description value for reply mail
         @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
+        @param cursor: the current row, from the database cursor,
+        @param user: the current user’s ID for security checks
+        @param ids: List of case IDs
         @param context: A standard dictionary for contextual values
         """
-
         for case in self.browse(cursor, user, ids, context=context):
             if case.email_last:
                 description = case.email_last
                 self.write(cursor, user, case.id, {
-                    'description': '> ' + description.replace('\n', '\n> '),
+                    'description': '> ' + description.replace('\n', '\n> '), 
                     }, context=context)
         return True
 
-    def case_log(self, cr, uid, ids, context={}, email=False, *args):
-
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        @param *args: Give Tuple Value
-        """
-
-        cases = self.browse(cr, uid, ids)
-        self.__history(cr, uid, cases, _('Historize'), history=True, email=email)
-        return self.write(cr, uid, ids, {'description': False, 'som': False,
-            'canal_id': False})
-
-    def case_log_reply(self, cr, uid, ids, context={}, email=False, *args):
-
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        @param *args: Give Tuple Value
-        """
-
-        cases = self.browse(cr, uid, ids)
-        for case in cases:
-            if not case.email_from:
-                raise osv.except_osv(_('Error!'),
-                        _('You must put a Partner eMail to use this action!'))
-
-            if not case.user_id:
-                raise osv.except_osv(_('Error!'),
-                        _('You must define a responsible user for this case in order to use this action!'))
-
-            if not case.description:
-                raise osv.except_osv(_('Error!'),
-                        _('Can not send mail with empty body,you should have description in the body'))
-
-        self.__history(cr, uid, cases, _('Send'), history=True, email=False)
-        for case in cases:
-            self.write(cr, uid, [case.id], {
-                'description': False,
-                })
-            emails = [case.email_from] + (case.email_cc or '').split(',')
-            emails = filter(None, emails)
-            body = case.description or ''
-            if case.user_id.signature:
-                body += '\n\n%s' % (case.user_id.signature)
-
-            emailfrom = case.user_id.address_id and case.user_id.address_id.email or False
-            if not emailfrom:
-                raise osv.except_osv(_('Error!'),
-                        _("No E-Mail ID Found for your Company address!"))
-
-            tools.email_send(
-                emailfrom,
-                emails,
-                '[' + str(case.id) + '] ' + case.name,
-                self.format_body(body),
-                reply_to = case.section_id.reply_to,
-                openobject_id = str(case.id)
-            )
-            self.__history(cr, uid, [case], _('Send'), history=True, email=emails, details=body, email_from=emailfrom)
-        return True
-
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
-        """
+        """This function returns value of partner address based on partner
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param part: Partner's id
+        @email: Partner's email ID 
         """
         if not part:
-            return {'value': {'partner_address_id': False,
-                            'email_from': False,
+            return {'value': {'partner_address_id': False, 
+                            'email_from': False, 
                             }}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
         data = {'partner_address_id': addr['contact']}
@@ -667,29 +596,27 @@ class crm_case(osv.osv):
         return {'value': data}
 
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-
-        """
+        """This function returns value of partner email based on Partner Address
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param add: Id of Partner's address
+        @email: Partner's email ID 
         """
-
-        data = {}
         if not add:
             return {'value': {'email_from': False}}
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
-        data['email_from'] = address.email
-        return {'value': data}
+        return {'value': {'email_from': address.email}}
 
     def case_close(self, cr, uid, ids, *args):
-        """
+        """Closes Case
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Close'))
@@ -701,14 +628,13 @@ class crm_case(osv.osv):
         return True
 
     def case_escalate(self, cr, uid, ids, *args):
-        """
+        """Escalates case to top level
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         for case in cases:
             data = {'active': True, 'user_id': False}
@@ -719,42 +645,39 @@ class crm_case(osv.osv):
                     data['user_id'] = case.section_id.parent_id.user_id.id
             else:
                 raise osv.except_osv(_('Error !'), _('You can not escalate this case.\nYou are already at the top level.'))
-            self.write(cr, uid, ids, data)
+            self.write(cr, uid, [case.id], data)
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Escalate'))
         self._action(cr, uid, cases, 'escalate')
         return True
 
-
     def case_open(self, cr, uid, ids, *args):
-        """
+        """Opens Case
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Open'))
+
         for case in cases:
             data = {'state': 'open', 'active': True}
             if not case.user_id:
                 data['user_id'] = uid
-            self.write(cr, uid, ids, data)
+            self.write(cr, uid, case.id, data)
         self._action(cr, uid, cases, 'open')
         return True
 
-
     def case_cancel(self, cr, uid, ids, *args):
-        """
+        """Cancels Case
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Cancel'))
@@ -763,15 +686,13 @@ class crm_case(osv.osv):
         return True
 
     def case_pending(self, cr, uid, ids, *args):
-
-        """
+        """Marks case as pending
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Pending'))
@@ -780,15 +701,13 @@ class crm_case(osv.osv):
         return True
 
     def case_reset(self, cr, uid, ids, *args):
-
-        """
+        """Resets case as draft
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
         """
-
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Draft'))
@@ -806,16 +725,16 @@ class crm_case_log(osv.osv):
 
     _order = "id desc"
     _columns = {
-        'name': fields.char('Status', size=64),
-        'date': fields.datetime('Date'),
-        'section_id': fields.many2one('crm.case.section', 'Section'),
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
-        'model_id': fields.many2one('ir.model', "Model"),
-        'res_id': fields.integer('Resource ID'),
+        'name': fields.char('Status', size=64), 
+        'date': fields.datetime('Date'), 
+        'section_id': fields.many2one('crm.case.section', 'Section'), 
+        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
+        'model_id': fields.many2one('ir.model', "Model"), 
+        'res_id': fields.integer('Resource ID'), 
     }
 
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
     }
 
 crm_case_log()
@@ -829,14 +748,13 @@ class crm_case_history(osv.osv):
     _inherits = {'crm.case.log': "log_id"}
 
     def _note_get(self, cursor, user, ids, name, arg, context=None):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of case History’s IDs
-            @param context: A standard dictionary for contextual values
+        """ Gives case History Description
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case History’s IDs
+        @param context: A standard dictionary for contextual values
         """
-
         res = {}
         for hist in self.browse(cursor, user, ids, context or {}):
             res[hist.id] = (hist.email or '/') + ' (' + str(hist.date) + ')\n'
@@ -849,6 +767,7 @@ class crm_case_history(osv.osv):
         'email_to': fields.char('Email TO', size=84),
         'email_from' : fields.char('Email From', size=84),
         'log_id': fields.many2one('crm.case.log','Log',ondelete='cascade'),
+        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True),
     }
 
 crm_case_history()
@@ -858,7 +777,7 @@ class users(osv.osv):
     _inherit = 'res.users'
     _description = "Users"
     _columns = {
-        'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'context_section_id': fields.many2one('crm.case.section', 'Sales Team'), 
     }
 users()
 
@@ -866,7 +785,7 @@ users()
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
     }
 res_partner()
 
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 6e6e9b9fcaa..718b12bb9c3 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -70,7 +70,7 @@ class case(osv.osv):
         """
         for case in self.browse(cr, uid, ids):
             if not case.section_id.reply_to:
-                raise osv.except_osv(_('Error!'), ("Reply To is not specified in Section"))
+                raise osv.except_osv(_('Error!'), ("Reply To is not specified in the sales team"))
             if not case.email_from:
                 raise osv.except_osv(_('Error!'), ("Partner Email is not specified in Case"))
             if case.section_id.reply_to and case.email_from:
@@ -259,11 +259,11 @@ class base_action_rule_line(osv.osv):
         return res + crm.AVAILABLE_PRIORITIES
 
     _columns = {
-        'trg_section_id': fields.many2one('crm.case.section', 'Section'),
+        'trg_section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'trg_max_history': fields.integer('Maximum Communication History'),
         'trg_categ_id':  fields.many2one('crm.case.categ', 'Category'),
         'regex_history' : fields.char('Regular Expression on Case History', size=128),
-        'act_section_id': fields.many2one('crm.case.section', 'Set section to'),
+        'act_section_id': fields.many2one('crm.case.section', 'Set Team to'),
         'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'),
         'act_mail_to_partner': fields.boolean('Mail to partner',help="Check this \
                                 if you want the rule to send an email to the partner."),
diff --git a/addons/crm/crm_action_rule_view.xml b/addons/crm/crm_action_rule_view.xml
index 8fee80c86f2..78767a2f795 100644
--- a/addons/crm/crm_action_rule_view.xml
+++ b/addons/crm/crm_action_rule_view.xml
@@ -8,14 +8,14 @@
             <field name="inherit_id" ref="base_action_rule.view_base_action_rule_line_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <group name="partner" position="after">
-	            	<group col="2" colspan="2">
-		            	<separator colspan="4" string="Condition on Communication History"/>
-		            	<field name="regex_history"/>
-		            	<field name="trg_max_history"/>
-	            	</group>
-	            </group>
-	        </field>
+                <group name="partner" position="after">
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Condition on Communication History"/>
+                        <field name="regex_history"/>
+                        <field name="trg_max_history"/>
+                    </group>
+                </group>
+            </field>
        </record>
 
        <record id="view_base_action_rule_line_form2" model="ir.ui.view">
@@ -24,14 +24,14 @@
             <field name="inherit_id" ref="base_action_rule.view_base_action_rule_line_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <group name="partner" position="after">
-	            	<group col="2" colspan="2">
-	            		<separator colspan="4" string="Condition Case Fields"/>
-						<field name="trg_section_id" select="1" widget="selection"/>
-		                <field name="trg_categ_id"/>
-			        </group>
-				</group>
-	        </field>
+                <group name="partner" position="after">
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Condition Case Fields"/>
+                        <field name="trg_section_id" select="1" widget="selection"/>
+                        <field name="trg_categ_id"/>
+                    </group>
+                </group>
+            </field>
        </record>
 
        <record id="view_base_action_rule_line_form3" model="ir.ui.view">
@@ -40,12 +40,12 @@
             <field name="inherit_id" ref="base_action_rule.view_base_action_rule_line_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <field name="act_user_id" position="after">
-	            	<field name="act_section_id"/>
-	            	<field name="act_categ_id"/>
+                <field name="act_user_id" position="after">
+                    <field name="act_section_id"/>
+                    <field name="act_categ_id"/>
                     <field name="act_mail_to_partner"/>
-	            </field>
-	        </field>
+                </field>
+            </field>
        </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml
index d2d78d78b54..7b52343342e 100644
--- a/addons/crm/crm_claims_menu.xml
+++ b/addons/crm/crm_claims_menu.xml
@@ -1,52 +1,53 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
+    <data noupdate="1">
 
-	    <menuitem id="base.menu_aftersale" name="After-Sale Services"
-	    	parent="base.menu_base_partner" sequence="6" />
+        <menuitem id="base.menu_aftersale" name="After-Sale Services"
+            groups="base.group_extended"
+            parent="base.menu_base_partner" sequence="6" />
 
-	    <!-- Claims Menu -->
+        <!-- Claims Menu -->
 
-	    <record model="ir.actions.act_window" id="crm_case_categ_claim0">
-	        <field name="name">Claims</field>
-	        <field name="res_model">crm.claim</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,calendar,form,graph</field>
-	        <field name="view_id" ref="crm_case_claims_tree_view"/>
-            <field name="context">{"search_default_section_id":section_id,"search_default_Current":1,"search_default_My Claims":1}</field>
-	        <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
-	    </record>
+        <record model="ir.actions.act_window" id="crm_case_categ_claim0">
+            <field name="name">Claims</field>
+            <field name="res_model">crm.claim</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="view_id" ref="crm_case_claims_tree_view"/>
+            <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>            
+            <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
+        </record>
 
-	    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="crm_case_claims_tree_view"/>
-	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-	    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="crm_case_claims_tree_view"/>
+            <field name="act_window_id" ref="crm_case_categ_claim0"/>
+        </record>
 
-	    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">calendar</field>
-	        <field name="view_id" ref="crm_case_claims_calendar_view"/>
-	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-	    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">calendar</field>
+            <field name="view_id" ref="crm_case_claims_calendar_view"/>
+            <field name="act_window_id" ref="crm_case_categ_claim0"/>
+        </record>
 
-	    <record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
-	        <field name="sequence" eval="3"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="crm_case_claims_form_view"/>
-	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-	    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_case_claims_form_view"/>
+            <field name="act_window_id" ref="crm_case_categ_claim0"/>
+        </record>
 
-	    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
-	        <field name="sequence" eval="4"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
-	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-	    </record>
+        <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
+            <field name="sequence" eval="4"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
+            <field name="act_window_id" ref="crm_case_categ_claim0"/>
+        </record>
 
-	    <menuitem name="Claims" id="menu_crm_case_claims"
-	    	parent="base.menu_aftersale" action="crm_case_categ_claim0" />
+        <menuitem name="Claims" id="menu_crm_case_claims"
+            parent="base.menu_aftersale" action="crm_case_categ_claim0" />
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 326da6c8973..722c1f3db94 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -108,7 +108,7 @@
                     </group>
                     <separator colspan="4" string="Status and Categorization"/>
                     <group colspan="4" col="6">
-                        <field name="user_id" string="Responsible" select="2"/>
+                        <field name="user_id" string="Responsible"/>
                         <field name="section_id" widget="selection"/>
                         <label string="Stage: " align="1.0"/>
                         <group colspan="1" col="2">
@@ -245,7 +245,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                   <filter icon="gtk-new" string="Current"
+                   <filter icon="gtk-new" string="Current" name="current"
                        domain="[('state','in',('draft', 'open'))]"
                        separator="1" help="Current Claims"
                    />
@@ -263,7 +263,7 @@
                    <field name="name" select='1'/>
                    <field name="partner_id" select="1"/>
                    <field name="user_id" select="1" widget="selection">
-                       <filter icon="terp-partner" string="My Claims"
+                       <filter icon="terp-partner" name="my_claims"
                                domain="[('user_id','=',uid)]" help="My Claims"/>
                            <filter icon="terp-partner"
                                domain="[('user_id','=', False)]"
diff --git a/addons/crm/crm_fund_menu.xml b/addons/crm/crm_fund_menu.xml
index 2694111d82f..bc4b91fa409 100644
--- a/addons/crm/crm_fund_menu.xml
+++ b/addons/crm/crm_fund_menu.xml
@@ -5,14 +5,15 @@
 <!-- MENU -->
 
     <menuitem id="base.menu_fundrising" name="Fund Raising"
-    	parent="base.menu_base_partner" sequence="7" />
+        groups="base.group_extended"
+        parent="base.menu_base_partner" sequence="7" />
 
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
         <field name="name">Funds</field>
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm.crm_case_tree_view_fund"/>
-        <field name="context">{"search_default_My Funds":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_my_funds":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_fund_filter"/>
     </record>
 
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index c72fd810603..a2a104adf15 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -15,6 +15,7 @@
 
     <menuitem action="crm_fund_categ_action"
         id="menu_crm_case_fundraising-act"
+        groups="base.group_extended"
         parent="crm.menu_crm_case_categ" />
 
 <!-- Fund Stage Form View -->
@@ -29,6 +30,7 @@
         </record>
 
         <menuitem action="crm_fundraising_stage_act"
+            groups="base.group_extended"
             id="menu_crm_fundraising_stage_act"
             parent="crm.menu_crm_case_stage" />
 
@@ -44,6 +46,7 @@
         </record>
 
         <menuitem action="crm_fundraising_resource_act"
+            groups="base.group_extended"
             id="menu_crm_fundraising_resource_act"
             parent="crm.menu_crm_case_resource_type" />
 
@@ -78,6 +81,7 @@
                     states="draft,open" type="object" icon="gtk-media-pause" />
                 <button name="case_escalate" string="Escalate"
                     states="open,draft,pending" type="object"
+                    groups="base.group_extended"
                     icon="gtk-go-up" />
                 <button name="case_reset" string="Reset to Draft"
                     states="done,cancel" type="object" icon="gtk-convert" />
@@ -117,7 +121,7 @@
                     <field name="probability"/>
                     <separator colspan="4" string="Categorization"/>
                     <group colspan="4" col="6">
-                        <field name="user_id" select="2" string="Responsible"/>
+                        <field name="user_id" string="Responsible"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="categ_id" select="1"
                             widget="selection"
@@ -125,11 +129,11 @@
                         <field name="date"/>
                         <field name="duration"/>
                     </group>
-                    <separator colspan="4" string="Details"/>
+                    <separator colspan="4" string="Notes"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <button name="case_close" string="Done"
                             states="open,draft,pending" type="object"
                             icon="gtk-close" />
@@ -144,6 +148,7 @@
                             icon="gtk-media-pause" />
                         <button name="case_escalate" string="Escalate"
                             states="open,draft,pending" type="object"
+                            groups="base.group_extended"
                             icon="gtk-go-up" />
                         <button name="case_reset"
                             string="Reset to Draft" states="done,cancel"
@@ -252,7 +257,7 @@
                 <search string="Search Funds">
                    <group col='6' colspan='4'>
                        <filter icon="terp-partner" string="My Funds"
-                           domain="[('user_id','=',uid)]"
+                          name="my_funds" domain="[('user_id','=',uid)]"
                            separator="1"
                            help="Funds Related to Current User"
                            />
@@ -277,7 +282,7 @@
                                domain="[('user_id','=', False)]"
                                help="Unassigned" />
                        </field>
-                       <field name="section_id" select="1" widget="selection" string="Section">
+                       <field name="section_id" select="1" widget="selection" string="Sales Team">
                            <filter icon="terp-crm"
                                domain="[('section_id','=',context.get('section_id',False))]"
                                help="My section" />
diff --git a/addons/crm/crm_helpdesk_menu.xml b/addons/crm/crm_helpdesk_menu.xml
index 21ff93c91ec..b1a7dfcc428 100644
--- a/addons/crm/crm_helpdesk_menu.xml
+++ b/addons/crm/crm_helpdesk_menu.xml
@@ -11,7 +11,7 @@
         <field name="res_model">crm.helpdesk</field>
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="context">{"search_default_My Request":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_my_hd_request":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_helpdesk_filter"/>
     </record>
 
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index fc731ae30e7..dc11b071a4c 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -27,7 +27,7 @@
                 <group colspan="4" col="4">
                     <field colspan="4" name="name" select="1"/>
                     <field name="date" select="1"/>
-                    <field name="date_deadline" select="2"/>
+                    <field name="date_deadline"/>
                 </group>
                 <notebook colspan="4">
                     <page string="General">
@@ -38,9 +38,9 @@
                                 select="1" />
                             <field name="partner_address_id"
                                 on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                select="2" />
+                                />
 
-                            <field name="email_from" select="2" />
+                            <field name="email_from" />
                             <button name="remind_partner"
                                 states="open,pending"
                                 string="Send Reminder" type="object"
@@ -58,7 +58,7 @@
                                 icon="gtk-go-forward" />
                         </group>
 
-                        <separator colspan="4" string="Details"/>
+                        <separator colspan="4" string="Notes"/>
                         <field name="description" colspan="4"
                                 nolabel="1" widget="text_tag" readonly="1" />
                         <separator colspan="4"/>
@@ -88,9 +88,9 @@
                     </page>
                     <page string="History" groups="base.group_extended">
                         <field name="id" select="1"/>
-                        <field name="active" select="2"/>
-                        <field name="categ_id" select="2"/>
-                        <field name="som" select="2"/>
+                        <field name="active"/>
+                        <field name="categ_id"/>
+                        <field name="som"/>
                         <separator colspan="4" string="Dates"/>
                         <field name="create_date"/>
                         <field name="date_closed"/>
@@ -103,8 +103,8 @@
                             <form string="Actions">
                                 <separator colspan="4" string="Action Information"/>
                                 <field colspan="4" name="name"/>
-                                <field name="date" select="2"/>
-                                <field name="user_id" select="2"/>
+                                <field name="date"/>
+                                <field name="user_id"/>                                
                             </form>
                         </field>
                     </page>
@@ -177,6 +177,7 @@
                     states="draft,open" type="object"
                     icon="gtk-media-pause" />
                 <button name="case_escalate" string="Escalate"
+                    groups="base.group_extended"
                     states="open,draft,pending" type="object"
                     icon="gtk-go-up" />
                 <button name="case_reset" string="Reset to Draft"
@@ -223,10 +224,10 @@
                 <field name="name" select='1' string="Query"/>
                 <field name="partner_id" />
                 <field name="user_id" select="1" widget="selection">
-                    <filter icon="terp-partner" string="My Request"
+                    <filter icon="terp-partner" name="my_hd_request" 
                     domain="[('user_id','=',uid)]" help="My Helpdesk Requests"/>
                 </field>
-                <field name="section_id" select="1" widget="selection" string="Section">
+                <field name="section_id" select="1" widget="selection" string="Sales Team">
                     <filter icon="terp-crm"
                         domain="[('section_id','=',context.get('section_id',False))]"
                         help="My section" />
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9b034890fed..546431ac7c7 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -81,7 +81,8 @@ class crm_lead(osv.osv):
                     resource_id = False
                     if lead.user_id:
                         resource_ids = res_obj.search(cr, uid, [('user_id','=',lead.user_id.id)])
-                        resource_id = len(resource_ids) or resource_ids[0]
+                        if len(resource_ids):
+                            resource_id = resource_ids[0]
 
                     duration = float(ans.days)
                     if lead.section_id.resource_calendar_id:
@@ -122,7 +123,7 @@ class crm_lead(osv.osv):
         'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
 
         'user_id': fields.many2one('res.users', 'Salesman'),
-        'referred': fields.char('Referred By', size=32),
+        'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
         'day_open': fields.function(_compute_day, string='Days to Open', \
                                 method=True, multi='day_open', type="integer", store=True),
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index eb8c09008fc..d9424b77fc4 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -7,7 +7,8 @@
         <field name="res_model">crm.lead</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="context">{"search_default_Current":1,"search_default_My Lead":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
@@ -24,10 +25,11 @@
     </record>
 
     <menuitem id="base.menu_sales" name="Sales"
-    	parent="base.menu_base_partner" sequence="1" />
+        parent="base.menu_base_partner" sequence="1" />
     <menuitem parent="base.menu_sales" name="Leads"
-    	id="menu_crm_case_categ0_act_leads"
-    	action="crm_case_category_act_leads_all" sequence="1" />
+        groups="base.group_extended"
+        id="menu_crm_case_categ0_act_leads"
+        action="crm_case_category_act_leads_all" sequence="1" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d93e5f94562..829372fb30b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,6 +13,7 @@
         <field name="context">{'object_id':'crm.lead'}</field>
     </record>
     <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act"
+        groups="base.group_extended"
         parent="crm.menu_crm_case_stage" />
 
     <!--  Resource Type Form View -->
@@ -27,6 +28,7 @@
         </record>
         <menuitem action="crm_lead_resource_act"
             id="menu_crm_lead_resource_act"
+            groups="base.group_extended"
             parent="crm.menu_crm_case_resource_type" />
 
 <!-- CRM Lead Form View  -->
@@ -42,18 +44,17 @@
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
-                            name="convert_opportunity"
-                            string="Convert"
-                            help="Convert into Opportunity"
-                            icon="gtk-index"
-                            type="object"
-                            attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
+                         name="convert_opportunity"
+                         string="Convert"
+                         help="Convert to Opportunity"
+                         icon="gtk-index"   
+                         type="object"
+                         attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                     <newline />
                     <field name="section_id" colspan="1"
                         widget="selection" />
                     <field name="user_id" />
                     <field name="stage_id" widget="selection"
-                        readonly="1"
                         domain="[('object_id.model', '=', 'crm.lead')]" />
                     <group col="2" colspan="1">
                         <button name="stage_previous" string="Previous"
@@ -102,7 +103,7 @@
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <button name="case_close" string="Close"
                             states="open,draft,pending" type="object"
                             icon="gtk-close" />
@@ -117,6 +118,7 @@
                             icon="gtk-media-pause" />
                         <button name="case_escalate" string="Escalate"
                             states="open,draft,pending" type="object"
+                            groups="base.group_extended"
                             icon="gtk-go-up" />
                         <button name="case_reset"
                             string="Reset to Draft" states="done,cancel"
@@ -166,9 +168,9 @@
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
                             <button colspan="4"
-                                string="Reply to Email"
+                                string="Reply to Last Email"
                                 name="%(action_crm_send_mail)d"
-                                context="{'mail':'reply', 'model': 'crm.lead'}"
+                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
                                 icon="gtk-undo" type="action" />
                         </form>
                         <tree string="Communication history">
@@ -223,9 +225,9 @@
                     states="open,draft,pending" type="object"
                     icon="gtk-close" />
                 <button string="Convert to Opportunity"
-                    name="%(action_crm_lead2opportunity)d"
+                    name="convert_opportunity"
                     states="draft,open,pending" icon="gtk-index"
-                    type="action" />
+                    type="object" />
                 <button name="case_escalate" string="Escalate"
                     states="open,draft,pending" type="object"
                     icon="gtk-go-up" />
@@ -262,7 +264,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <filter icon="terp-project"
+                <filter icon="terp-project" name="current"
                     string="Current"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-project"
@@ -288,7 +290,7 @@
                 <field name="user_id" widget="selection">
                     <filter icon="terp-partner"
                         domain="[('user_id','=',uid)]"
-                        help="My Leads" string="My Lead"
+                        help="My Leads" name="my_lead"
                     />
                     <filter icon="terp-partner"
                         domain="[('user_id','=', False)]"
diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py
index aef624d1bf5..65ca7626468 100644
--- a/addons/crm/crm_mailgate.py
+++ b/addons/crm/crm_mailgate.py
@@ -32,87 +32,96 @@ import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
 
+from tools import command_re
+
 class crm_cases(osv.osv):
     """ crm cases """
 
     _name = "crm.case"
     _inherit = "crm.case"    
 
-    def msg_new(self, cr, uid, msg):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks
+    def message_new(self, cr, uid, msg, context):
+        """
+        Automatically calls when new email message arrives
+        
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks
         """
 
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_body = mailgate_obj.msg_body_get(msg)
-        msg_subject = mailgate_obj._decode_header(msg['Subject'])
-        msg_from = mailgate_obj._decode_header(msg['From'])
-        msg_cc = mailgate_obj._decode_header(msg['Cc'])
-        body = self.format_body(msg_body['body'])
-        data = {   
-            'name': msg_subject,         
+        mailgate_pool = self.pool.get('email.server.tools')
+
+        subject = msg.get('subject')
+        body = msg.get('body')
+        msg_from = msg.get('from')
+        priority = msg.get('priority')
+        
+        vals = {
+            'name': subject,
             'email_from': msg_from,
-            'email_cc': msg_cc,            
+            'email_cc': msg.get('cc'),
+            'description': body,
             'user_id': False,
-            'description': body,            
         }
-        res = mailgate_obj.partner_get(cr, uid, msg_from)
+        if msg.get('priority', False):
+            vals['priority'] = priority
+        
+        res = mailgate_pool.get_partner(cr, uid, msg.get('from'))
         if res:
-            data.update(res)
-        res = self.create(cr, uid, data)        
-        cases = self.browse(cr, uid, [res])       
-        self._history(cr, uid, cases, _('Receive'), history=True, details=body, email_from=msg_from)
+            vals.update(res)
+        res = self.create(cr, uid, vals, context)
+        cases = self.browse(cr, uid, [res])
+        self._history(cr, uid, cases, _('Receive'), history=True, details=body, email_from=msg_from, message_id=msg.get('id'))
         return res
 
-    def msg_update(self, cr, uid, ids, msg, data={}, default_act='pending'):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of update mail’s IDs """
-
+    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context={}):
+        """ 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of update mail’s IDs 
+        """
+        
         if isinstance(ids, (str, int, long)):
-            select = [ids]
-        else:
-            select = ids
-        mailgate_obj = self.pool.get('mail.gateway')
-        msg_actions, body_data = mailgate_obj.msg_act_get(msg)
-        data.update({
-            'description': body_data,
+            ids = [ids]
+        
+        msg_from = msg['from']
+        vals.update({
+            'description': msg['body']
         })
-        act = 'case_'+default_act
-        if 'state' in msg_actions:
-            if msg_actions['state'] in ['draft','close','cancel','open','pending']:
-                act = 'case_' + msg_actions['state']
+        if msg.get('priority', False):
+            vals['priority'] = msg.get('priority')
 
-        for k1,k2 in [('cost','planned_cost'),('revenue','planned_revenue'),('probability','probability')]:
-            if k1 in msg_actions:
-                data[k2] = float(msg_actions[k1])
-
-        if 'priority' in msg_actions:
-            if msg_actions['priority'] in ('1','2','3','4','5'):
-                data['priority'] = msg_actions['priority']
-
-        if 'partner' in msg_actions:
-            data['email_from'] = msg_actions['partner'][:128]        
-        msg_from = self._decode_header(msg['From'])
-        res = self.write(cr, uid, select, data)
-        cases = self.browse(cr, uid, select)       
-        self._history(cr, uid, cases, _('Receive'), history=True, details=body_data, email_from=msg['From'])        
-        getattr(self,act)(cr, uid, select)
+        maps = {
+            'cost':'planned_cost',
+            'revenue': 'planned_revenue',
+            'probability':'probability'
+        }
+        vls = { }
+        for line in msg['body'].split('\n'):
+            line = line.strip()
+            res = command_re.match(line)
+            if res and maps.get(res.group(1).lower(), False):
+                key = maps.get(res.group(1).lower())
+                vls[key] = res.group(2).lower()
+        
+        vals.update(vls)
+        res = self.write(cr, uid, ids, vals)
+        cases = self.browse(cr, uid, ids)
+        message_id = context.get('references_id', False)
+        self._history(cr, uid, cases, _('Receive'), history=True, details=msg['body'], email_from=msg_from, message_id=message_id)        
+        #getattr(self, act)(cr, uid, select)
         return res
 
     def emails_get(self, cr, uid, ids, context={}):
 
-        """ Get Emails
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of email’s IDs
-            @param context: A standard dictionary for contextual values
-
+        """ 
+        Get Emails
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of email’s IDs
+        @param context: A standard dictionary for contextual values
         """
         res = []
         if isinstance(ids, (str, int, long)):
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index d76a31136ae..e0b968a1808 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -33,9 +33,7 @@ crm_opportunity()
 
 class crm_phonecall(osv.osv):
     """ CRM Phonecall """
-
     _name = 'crm.phonecall'
-
 crm_phonecall()
 
 
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index c65bae2e41e..b376d34c5d9 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -85,7 +85,7 @@
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="context">{"search_default_Current":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_current":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index b350812c0f9..35415a9d028 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -14,7 +14,7 @@
     </record>
 
     <menuitem action="crm_meeting_categ_action"
-    	id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ" />
 
 <!-- CRM Meetings Form View -->
 
@@ -28,26 +28,28 @@
                     <field name="name" select="1" string="Summary"
                         colspan="4" />
                     <field name="categ_id" widget="selection"
-                    	string="Meeting Type"
-                    	domain="[('object_id.model', '=', 'crm.meeting')]" />
+                        string="Meeting Type"
+                        groups="base.group_extended"
+                        domain="[('object_id.model', '=', 'crm.meeting')]" />
+                    <newline/>
                     <field name="date" string="Start Date" required="1"
-                    	on_change="onchange_dates(date,duration,False)" />
+                        on_change="onchange_dates(date,duration,False)" />
                     <field name="duration" widget="float_time"
-                    	on_change="onchange_dates(date,duration,False)" />
+                        on_change="onchange_dates(date,duration,False)" />
                     <field name="date_deadline" string="End Date"
-                    	required="1"
-                    	on_change="onchange_dates(date,False,date_deadline)" />
+                        required="1"
+                        on_change="onchange_dates(date,False,date_deadline)" />
                     <field name="location" />
                     <field name="alarm_id" string="Reminder"
-                    	widget="selection" />
+                        widget="selection" />
                     <group colspan="2" col="4" >
                            <field name="rrule_type" string="Recurrency"
                                 colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
                            <button string="Edit All"
-                           	help="Edit all Ourrences of recurrent Meeting"
-                           	attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                           	name="open_meeting" icon="gtk-edit"
-                           	type="object" />
+                               help="Edit all Ourrences of recurrent Meeting"
+                               attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
+                               name="open_meeting" icon="gtk-edit"
+                               type="object" />
                     </group>
                 </group>
                 <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
@@ -99,8 +101,9 @@
                     <group col="6" colspan="4">
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Assignment"/>
-                            <field name="section_id" widget="selection" />
                             <field name="user_id" />
+                            <field name="section_id" widget="selection"
+                                groups="base.group_extended"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Contacts"/>
                             <field name="partner_id" string="Partner"
@@ -111,18 +114,18 @@
                             <field name="email_from"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Visibility"/>
-                            <field name="show_as" string="Show time as"/>
                             <field name="class" string="Privacy"/>
+                            <field name="show_as" string="Show time as" groups="base.group_extended"/>
                             <field name="rrule" groups="base.group_extended" />
-                            <field name="recurrent_id" invisible="1" />
-                            <field name="recurrent_uid" invisible="1" />
+                            <field name="recurrent_id" invisible="1"/>
+                            <field name="recurrent_uid" invisible="1"/>
                         </group>
                     </group>
                     <separator string="Description" colspan="4" />
                     <field name="description" nolabel="1" colspan="4" />
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="2" />
+                        <field name="state" />
                         <button name="case_close" string="Done"
                             states="open" type="object"
                             icon="gtk-jump-to" />
@@ -155,29 +158,29 @@
                                         <field name="role" select="1" />
                                         <separator colspan="4" string="" />
                                         <group col="6" colspan="4">
-                                            <field name="state" select="2" />
+                                            <field name="state" />
                                             <button name="do_tentative"
-                                            	states="needs-action,declined,accepted"
-                                            	string="Uncertain"
-                                            	type="object"
-                                            	icon="terp-crm" />
+                                                states="needs-action,declined,accepted"
+                                                string="Uncertain"
+                                                type="object"
+                                                icon="terp-crm" />
                                             <button name="do_accept"
-                                            	string="Accept"
-                                            	states="needs-action,tentative,declined"
-                                            	type="object"
-                                            	icon="gtk-apply" />
+                                                string="Accept"
+                                                states="needs-action,tentative,declined"
+                                                type="object"
+                                                icon="gtk-apply" />
                                             <button name="do_decline"
-                                            	string="Decline"
-                                            	states="needs-action,tentative,accepted"
-                                            	type="object"
-                                            	icon="gtk-cancel" />
+                                                string="Decline"
+                                                states="needs-action,tentative,accepted"
+                                                type="object"
+                                                icon="gtk-cancel" />
                                             <button
-                                            	name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                            	string="Delegate"
-                                            	type="action"
-                                            	icon="gtk-sort-descending"
-                                            	states="needs-action,tentative,declined,accepted"
-                                            	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                                string="Delegate"
+                                                type="action"
+                                                icon="gtk-sort-descending"
+                                                states="needs-action,tentative,declined,accepted"
+                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                                         </group>
                                     </page>
                                     <page string="Other">
@@ -202,15 +205,13 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Meetings"
-            	colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-            	<field name="id" widget="char" />
-            	<field name="name" string="Subject" />
-            	<field name="partner_id" string="Partner" />
-            	<field name="section_id" />
-            	<field name="date" string="Meeting Date" />
-            	<field name="categ_id" />
-            	<field name="user_id" />
-            	<field name="state" />
+                colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <field name="name" string="Subject" />
+                <field name="partner_id" string="Partner" />
+                <field name="date" string="Meeting Date" />
+                <field name="duration" />
+                <field name="user_id" />
+                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -257,19 +258,19 @@
                 <search string="Search Meetings">
                        <group col="12" colspan="4">
                            <filter icon="terp-crm" string="My Meetings"
-                           	domain="[('user_id','=',uid)]"
-                           	help="My Meetings" />
-                           <filter icon="terp-crm" string="Current"
+                               domain="[('user_id','=',uid)]"
+                               help="My Meetings" />
+                           <filter icon="terp-crm" name="current" string="Current"
                            domain="[('state','in',('draft', 'open'))]"
                            help="Current Meetings"/>
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
                            <field name="partner_id" select="1" />
                            <field name="section_id"
-                           	select="1" widget="selection">
-                           	<filter icon="terp-crm"
-                           		domain="[('section_id','=',context.get('section_id',False))]"
-                           		help="My section" />
+                               select="1" widget="selection">
+                               <filter icon="terp-crm"
+                                   domain="[('section_id','=',context.get('section_id',False))]"
+                                   help="My section" />
                            </field>
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index ad38f746c51..3e1fc24a803 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -39,7 +39,7 @@ class crm_opportunity(osv.osv):
 
     _name = "crm.opportunity"
     _description = "Opportunity Cases"
-    _order = "priority,id desc"
+    _order = "priority,date_action,id desc"
     _inherit = 'crm.case'
 
     def case_open(self, cr, uid, ids, *args):
@@ -88,7 +88,8 @@ class crm_opportunity(osv.osv):
                     resource_id = False
                     if opportunity.user_id:
                         resource_ids = res_obj.search(cr, uid, [('user_id','=',opportunity.user_id.id)])
-                        resource_id = len(resource_ids) and resource_ids[0] or False
+                        if resource_ids and len(resource_ids):
+                            resource_id = resource_ids[0]
 
                     duration = float(ans.days)
                     if opportunity.section_id.resource_calendar_id:
@@ -118,9 +119,8 @@ class crm_opportunity(osv.osv):
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                      domain="[('section_id','=',section_id), \
                     ('object_id.model', '=', 'crm.opportunity')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Resource Type',\
-                    domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'referred': fields.char('Referred By', size=64),
         'probability': fields.float('Probability (%)'),
         'planned_revenue': fields.float('Expected Revenue'),
         'ref': fields.reference('Reference', selection=crm._links_get, size=128),
@@ -129,6 +129,7 @@ class crm_opportunity(osv.osv):
         'user_id': fields.many2one('res.users', 'Salesman'),
         'phone': fields.char("Phone", size=64),
         'date_deadline': fields.date('Expected Closing'),
+        'date_action': fields.date('Next Action'),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index e88e0f1ec8e..b893d536e44 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -18,7 +18,6 @@
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="85000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_oppor3"/>
             <field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
@@ -34,7 +33,6 @@
             <field eval="45000.0" name="planned_revenue"/>
             <field eval="50" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_oppor1"/>
             <field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
@@ -51,7 +49,6 @@
             <field eval="55000.0" name="planned_revenue"/>
             <field eval="70" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor7"/>
             <field name="stage_id" ref="crm.stage_oppor5"/>
             <field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
@@ -68,7 +65,6 @@
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="45000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_oppor4"/>
             <field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
@@ -84,7 +80,6 @@
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="42000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
             <field name="stage_id" ref="crm.stage_oppor6"/>
             <field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index c7fba068c11..ba01ca72be4 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -27,7 +27,7 @@
           <field name="res_model">crm.opportunity</field>
           <field name="view_mode">tree,form,graph</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
-          <field name="context">{"search_default_My Oprtnit":1,"search_default_Current":1,"search_default_section_id":section_id}</field>
+          <field name="context">{"search_default_my_oprtnit":1,"search_default_new_oprtnit":1,"search_default_section_id":section_id}</field>          
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index e0e53f4cd8c..b7019885a4a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -79,6 +79,10 @@
                     <field name="date_deadline" string="Expected Closing"/>
                     <button string="Schedule Call"
                         name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action"  />
+
+                    <newline/>
+                    <field name="date_action"/>
+                    <field name="priority" string="Priority"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Opportunity">
@@ -94,9 +98,7 @@
                     </group>
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Categorization"/>
-                        <field name="type_id" select="1" string="Campaign" groups="base.group_extended"/>
                         <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="priority" string="Priority"/>
                         <field name="categ_id" select="1"
                             string="Category" widget="selection"
                             domain="[('object_id.model', '=', 'crm.opportunity')]" />
@@ -107,12 +109,13 @@
 
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"
                             icon="gtk-go-forward" />
                         <button name="case_escalate" string="Escalate"
                             states="open,draft,pending" type="object"
+                            groups="base.group_extended"
                             icon="gtk-go-up" />
                         <button name="case_pending" string="Pending"
                             states="draft,open" type="object"
@@ -142,6 +145,7 @@
                         <field name="active"/>
                         <field name="day_open"/>
                         <field name="day_close"/>
+                        <field name="referred"/>
                     </group>
                     <separator colspan="4" string="References"/>
                     <field name="ref"/>
@@ -207,7 +211,6 @@
                 <field name="partner_id"/>
                 <field name="stage_id"/>
                 <field name="categ_id" invisible="1"/>
-                <field name="type_id" invisible="1"/>
                 <button name="stage_previous" string="Previous"
                     states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next"
@@ -215,7 +218,7 @@
                     icon="gtk-go-forward" />
                 <field name="planned_revenue" sum="Expected Revenue"/>
                 <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                <field name="date_deadline" string="Expected Closing"/>
+                <field name="date_action"/>
                 <field name="section_id"/>
                 <field name="user_id"/>
                 <field name="priority"/>
@@ -281,7 +284,7 @@
                 <field name="name" string="Opportunity"/>
                 <field name="partner_id"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-partner" string="My Oprtnit"
+                    <filter icon="terp-partner" name="my_oprtnit"
                         domain="[('user_id','=',uid)]"
                         help="My Opportunities" />
                     <filter icon="terp-partner"
@@ -304,8 +307,6 @@
                     <filter string="Category" icon="terp-crm"
                         domain="[]" context="{'group_by':'categ_id'}" />
 
-                    <filter string="Campaign" icon="terp-crm"
-                        domain="[]" context="{'group_by':'type_id'}" />
                     <separator orientation="vertical" />
                     <filter string="Partner" icon="terp-crm" domain="[]"
                         context="{'group_by':'partner_id'}" />
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c3547b2023b..8f5e66564f8 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -20,7 +20,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
-        <field name="context">{"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
@@ -46,7 +46,8 @@
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
-    	parent="base.menu_base_partner" sequence="5" />
+        groups="base.group_extended"
+        parent="base.menu_base_partner" sequence="5" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
         <field name="name">Inbound</field>
@@ -55,7 +56,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
-        <field name="context">{"default_state":'open',"search_default_My Calls":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
@@ -81,8 +82,8 @@
     </record>
 
     <menuitem name="Inbound" id="menu_crm_case_phone_inbound"
-    	parent="crm.menu_crm_case_phone"
-    	action="crm_case_categ_phone_incoming0" />
+        parent="crm.menu_crm_case_phone"
+        action="crm_case_categ_phone_incoming0" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
         <field name="name">Outbound</field>
@@ -117,8 +118,8 @@
     </record>
 
     <menuitem name="Outbound" id="menu_crm_case_phone_outbound"
-    	parent="crm.menu_crm_case_phone"
-    	action="crm_case_categ_phone_outgoing0" />
+        parent="crm.menu_crm_case_phone"
+        action="crm_case_categ_phone_outgoing0" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 3fefc7ed249..dfa949ad0b7 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -161,7 +161,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <group>
                <filter icon="gtk-home" string="Today"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),\
                     ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
@@ -177,20 +176,19 @@
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
                <field name="user_id" widget="selection">
-                   <filter icon="terp-partner" string="My Calls"
-                       domain="[('user_id','=',uid)]"
-                       help="My Phonecalls"/>
+                   <filter icon="terp-partner" name="my_calls" 
+                       domain="[('user_id','=',uid)]" 
+                       help="My Phonecalls"/>               
                    <filter icon="terp-partner"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
-                   select="1" widget="selection" string="Section">
+                   select="1" widget="selection" string="Sales Team">
                    <filter icon="terp-crm"
                        domain="[('section_id','=',context.get('section_id',False))]"
                        help="My section" />
                </field>
-               </group>
                <newline/>
                <group expand="1" string="Group By..." colspan="4">
                    <filter string="Partner" icon="terp-crm" domain="[]"
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 4746829da12..9535992ab6a 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -5,7 +5,7 @@
 <!--  Cases by section and category2 of case Tree View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_tree">
-        <field name="name">CRM Report - Sections and Type(Tree)</field>
+        <field name="name">CRM Report - Teams and Type(Tree)</field>
         <field name="model">report.crm.case.section.categ2</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
@@ -27,7 +27,7 @@
 <!--  Cases by section and category2 of case Form View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_form">
-        <field name="name">CRM Report - Sections and Type(Form)</field>
+        <field name="name">CRM Report - Teams and Type(Form)</field>
         <field name="model">report.crm.case.section.categ2</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
@@ -70,18 +70,18 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section and Type">
                    <group col="10" colspan="4">
-                   		<filter string="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]"
-                   			help="Cases by Section and Type for this year" />
-                   		<filter string="This Month" icon="terp-hr"
-                   			domain="[('month','=',time.localtime()[1])]"
-                   			help="Cases by Section and Type for this month" />
-                   		<separator orientation="vertical"/>
-                   		<field name="section_id"
-                   			select="1" widget="selection" />
-                   		<field name="category2_id" select="1"/>
-                		<field name="nbr" select="1"/>
-                		<field name="state" select="1"/>
+                           <filter string="This Year" icon="terp-hr"
+                               domain="[('name','=',time.localtime()[0])]"
+                               help="Cases by Section and Type for this year" />
+                           <filter string="This Month" icon="terp-hr"
+                               domain="[('month','=',time.localtime()[1])]"
+                               help="Cases by Section and Type for this month" />
+                           <separator orientation="vertical"/>
+                           <field name="section_id"
+                               select="1" widget="selection" />
+                           <field name="category2_id" select="1"/>
+                        <field name="nbr" select="1"/>
+                        <field name="state" select="1"/>
                    </group>
                </search>
             </field>
@@ -155,23 +155,23 @@
 
 <!-- Cases by section and stage Search View -->
 
-	<record id="view_crm_case_section_stage_filter" model="ir.ui.view">
+    <record id="view_crm_case_section_stage_filter" model="ir.ui.view">
             <field name="name">CRM Report - Sections and Stage(Select)</field>
             <field name="model">report.crm.case.section.stage</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Section and Stage">
                    <group col="8" colspan="4">
-                   		<filter string="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]"
-                   			help="Cases by Section and Stage for this year" />
-                   		<filter string="This Month" icon="terp-hr"
-                   			domain="[('month','=',time.localtime()[1])]"
-                   			help="Cases by Section and Stage for this month" />
-                   		<separator orientation="vertical"/>
-						<field name="section_id" select="1" widget="selection"/>
-                		<field name="nbr" select="1"/>
-                		<field name="state" select="1"/>
+                           <filter string="This Year" icon="terp-hr"
+                               domain="[('name','=',time.localtime()[0])]"
+                               help="Cases by Section and Stage for this year" />
+                           <filter string="This Month" icon="terp-hr"
+                               domain="[('month','=',time.localtime()[1])]"
+                               help="Cases by Section and Stage for this month" />
+                           <separator orientation="vertical"/>
+                        <field name="section_id" select="1" widget="selection"/>
+                        <field name="nbr" select="1"/>
+                        <field name="state" select="1"/>
                    </group>
                </search>
             </field>
@@ -237,16 +237,16 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
                    <group col='8' colspan='4'>
-                   		<filter string="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]"
-                   			help="Cases by Section, Category and Stage for this year" />
-                   		<filter string="This Month" icon="terp-hr"
-                   			domain="[('month','=',time.localtime()[1])]"
-                   			help="Cases by Section, Category and Stage for this month" />
-                   		<separator orientation="vertical"/>
-						<field name="section_id" select="1" widget="selection"/>
-						<field name="nbr" select="1"/>
-                		<field name="state" select="1"/>
+                           <filter string="This Year" icon="terp-hr"
+                               domain="[('name','=',time.localtime()[0])]"
+                               help="Cases by Section, Category and Stage for this year" />
+                           <filter string="This Month" icon="terp-hr"
+                               domain="[('month','=',time.localtime()[1])]"
+                               help="Cases by Section, Category and Stage for this month" />
+                           <separator orientation="vertical"/>
+                        <field name="section_id" select="1" widget="selection"/>
+                        <field name="nbr" select="1"/>
+                        <field name="state" select="1"/>
 
                    </group>
                </search>
@@ -255,7 +255,7 @@
 
 <!-- Cases by section, category and stage Graph View -->
 
-	<record model="ir.ui.view" id="view_crm_case_section_categ_stage_graph">
+    <record model="ir.ui.view" id="view_crm_case_section_categ_stage_graph">
         <field name="name">CRM Report - Section, Category and Stage(Select)</field>
         <field name="model">report.crm.case.section.categ.stage</field>
         <field name="type">graph</field>
@@ -323,23 +323,23 @@
 
 <!--  Cases by section, category and category2 Search View -->
 
-	<record id="view_crm_case_section_categ_categ2_filter" model="ir.ui.view">
+    <record id="view_crm_case_section_categ_categ2_filter" model="ir.ui.view">
             <field name="name">CRM Report - Section, Category and Type(Select)</field>
             <field name="model">report.crm.case.section.categ.categ2</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
                    <group col='12' colspan='4'>
-                   		<filter string="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]"
-                   			help="Cases by User for this year" />
-                   		<filter string="This Month" icon="terp-hr"
-                   			domain="[('month','=',time.localtime()[1])]"
-                   			help="Cases by User for this month" />
-                   		<separator orientation="vertical"/>
-						<field name="section_id" select="1" widget="selection"/>
-						<field name="nbr" select="1"/>
-                		<field name="state" select="1"/>
+                           <filter string="This Year" icon="terp-hr"
+                               domain="[('name','=',time.localtime()[0])]"
+                               help="Cases by User for this year" />
+                           <filter string="This Month" icon="terp-hr"
+                               domain="[('month','=',time.localtime()[1])]"
+                               help="Cases by User for this month" />
+                           <separator orientation="vertical"/>
+                        <field name="section_id" select="1" widget="selection"/>
+                        <field name="nbr" select="1"/>
+                        <field name="state" select="1"/>
                    </group>
                </search>
             </field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 31dd875b7e0..0d4bb763556 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>
+        <menuitem id="menu_crm_configuration" name="Cases"
+            parent="base.menu_base_config" sequence="0"/>
 
 <!-- Case Sections Form View -->
 
@@ -11,16 +12,31 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Case Section">
-                    <notebook>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" colspan="4"/>
+                        <field name="code" select="1"/>
+                        <newline/>
+                        <field name="resource_calendar_id" select="2"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Case section">
-                            <field name="name" select="1"/>
-                            <field name="code" select="1"/>
-                            <field name="user_id" select="2"/>
-                            <field name="active" select="2"/>
-                            <field name="parent_id" select="2" widget="selection"/>
-                            <field name="allow_unlink" select="2"/>
-                            <field name="reply_to" select="2"/>
-                            <field name="resource_calendar_id" select="2"/>
+                            <group col="2" colspan="2">
+                                <separator string="Responsible" colspan="2"/>
+                                <field name="parent_id" select="2" widget="selection"/>
+                                <field name="user_id" select="2"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Contact Information" colspan="2"/>
+                                <field name="server_id" select="2"/>
+                                <field name="reply_to" select="2"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Section Property" colspan="2"/>
+                                <field name="active" select="2"/>
+                                <field name="allow_unlink" select="2"/>
+                            </group>
+                            <separator string="Note" colspan="4"/>
+                            <field name="note" select="1" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
                 </form>
@@ -280,6 +296,7 @@
                         icon="gtk-media-pause" />
                     <button name="case_escalate"
                         states="open,draft,pending" string="Escalate"
+                        groups="base.group_extended"
                         type="object" icon="gtk-go-up" />
                     <button name="case_reset" states="done,cancel"
                         string="Reset to Draft" type="object"
@@ -300,7 +317,7 @@
                     <field colspan="4" name="name" select="1"/>
                     <field colspan="2" name="section_id" widget="selection"/>
                     <field name="create_date" select="1"/>
-                    <field name="date_deadline" select="2"/>
+                    <field name="date_deadline"/>
                     <newline />
                     <notebook colspan="4">
                         <page string="General">
@@ -311,10 +328,10 @@
                                 <field colspan="3"
                                     name="partner_address_id"
                                     on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                    select="2" />
+                                    />
                                 <newline />
                                 <field colspan="3" name="email_from"
-                                    select="2" />
+                                    />
                                 <button name="remind_partner"
                                     states="open,pending"
                                     string="Send Reminder" type="object"
@@ -347,6 +364,7 @@
                                 <button name="case_escalate"
                                     states="open,draft,pending"
                                     string="Escalate" type="object"
+                                    groups="base.group_extended"
                                     icon="gtk-go-up" />
                                 <button name="case_reset"
                                     states="done,cancel"
@@ -356,15 +374,15 @@
                         </page>
                         <page string="History" groups="base.group_extended">
                             <field name="id" select="1"/>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <separator colspan="4" string="Dates"/>
                             <field name="create_date"/>
                             <field colspan="4" name="log_ids" nolabel="1">
                                 <form string="Actions">
                                     <separator colspan="4" string="Action Information"/>
                                     <field colspan="4" name="name"/>
-                                    <field name="date" select="2"/>
-                                    <field name="user_id" select="2"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
                                 </form>
                             </field>
                         </page>
@@ -485,11 +503,11 @@
                     <field colspan="4" name="name" select="1"/>
                     <field name="date" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="model_id" select="2"/>
-                    <field name="res_id" select="2"/>
-                    <field name="som" select="2"/>
-                    <field name="canal_id" select="2"/>
-                    <field colspan="4" name="description" select="2"/>
+                    <field name="model_id"/>
+                    <field name="res_id"/>
+                    <field name="som"/>
+                    <field name="canal_id"/>
+                    <field colspan="4" name="description"/>
                 </form>
             </field>
         </record>
@@ -554,9 +572,9 @@
                 <form string="Partner Segmentation Lines">
                     <field colspan="4" name="name" select="1"/>
                     <group col="2" colspan="4">
-                        <field name="expr_name" select="2"/>
-                        <field name="expr_operator" select="2"/>
-                        <field name="expr_value" select="2"/>
+                        <field name="expr_name"/>
+                        <field name="expr_operator"/>
+                        <field name="expr_value"/>
                     </group>
                     <newline/>
                     <field name="operator"/>
@@ -574,7 +592,7 @@
                 <form string="Partner Segmentation">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="categ_id" select="2"/>
+                        <field name="categ_id"/>
                         <field name="exclusif"/>
                     </group>
                     <notebook colspan="4">
@@ -589,7 +607,7 @@
                             <field colspan="4" name="segmentation_line" widget="one2many_list" nolabel="1"/>
                         </page>
                         <page string="Description">
-                               <field colspan="4" name="description" select="2" nolabel="1"/>
+                               <field colspan="4" name="description" nolabel="1"/>
                            </page>
                     </notebook>
                     <field name="state"/>
@@ -639,6 +657,7 @@
         </record>
         <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
+            groups="base.group_extended"
             parent="crm.menu_crm_configuration" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
@@ -663,7 +682,7 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="password" position="after">
-                    <field name="context_section_id" completion="1" widget="selection"/>
+                        <field name="context_section_id" completion="1" widget="selection"/>
                     </field>
                 </field>
         </record>
@@ -678,7 +697,8 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="parent_id" position="after">
-                    <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
                     </field>
                 </field>
         </record>
@@ -691,7 +711,8 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="lang" position="after">
-                    <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
                     </field>
                 </field>
         </record>
@@ -704,7 +725,8 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="category_id" position="after">
-                        <field name="section_id" completion="1" widget="selection"/>
+                        <field name="section_id" completion="1" widget="selection"
+                            groups="base.group_extended"/>
                     </field>
                 </field>
         </record>
diff --git a/addons/crm/i18n/ar.po b/addons/crm/i18n/ar.po
index 91e6dd58b89..bbfd261e3f1 100644
--- a/addons/crm/i18n/ar.po
+++ b/addons/crm/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/bg.po b/addons/crm/i18n/bg.po
index bd11f72d9c1..21732146269 100644
--- a/addons/crm/i18n/bg.po
+++ b/addons/crm/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/bs.po b/addons/crm/i18n/bs.po
index ccae5c54f9a..5e1944bdca4 100644
--- a/addons/crm/i18n/bs.po
+++ b/addons/crm/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ca.po b/addons/crm/i18n/ca.po
index 89539e3d7fa..25f3213b740 100644
--- a/addons/crm/i18n/ca.po
+++ b/addons/crm/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/cs.po b/addons/crm/i18n/cs.po
index 919bda279ee..d4d3cf0132f 100644
--- a/addons/crm/i18n/cs.po
+++ b/addons/crm/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index fe49389532c..b06582928a7 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/el.po b/addons/crm/i18n/el.po
index 8aa104a4fed..bad66a5a6fa 100644
--- a/addons/crm/i18n/el.po
+++ b/addons/crm/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 16a23891c8a..135128bc3eb 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/es_AR.po b/addons/crm/i18n/es_AR.po
index 03ce5ef5764..7cbbaf3befa 100644
--- a/addons/crm/i18n/es_AR.po
+++ b/addons/crm/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/et.po b/addons/crm/i18n/et.po
index ef3031395c6..014dcf6987e 100644
--- a/addons/crm/i18n/et.po
+++ b/addons/crm/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 123847c8f0e..ee51240f4c7 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index e84713ad35a..d832ad53d4c 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.7\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-02-09 23:36+0000\n"
-"Last-Translator: Sebastien LANGE - http://www.Syleam.fr <Unknown>\n"
+"PO-Revision-Date: 2010-04-14 15:48+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <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-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -1753,7 +1753,7 @@ msgstr "Planifier un appel téléphonique"
 #. module: crm
 #: field:crm.case,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Référence"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
@@ -2408,6 +2408,8 @@ msgstr "Historique"
 msgid ""
 "This may help associations in their fund raising process and tracking."
 msgstr ""
+"Ceci peut aider les associations dans leur procédure de collecte de fonds et "
+"de suivi."
 
 #. module: crm
 #: view:crm.meeting:0
diff --git a/addons/crm/i18n/gl.po b/addons/crm/i18n/gl.po
index 8542650db8b..e8a44dde5bb 100644
--- a/addons/crm/i18n/gl.po
+++ b/addons/crm/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+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 0c8433ae71f..7cac4268a29 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index e8cc4ebc8d2..eff7533d4ff 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/id.po b/addons/crm/i18n/id.po
index e74dbbeee17..d79ea4d5aed 100644
--- a/addons/crm/i18n/id.po
+++ b/addons/crm/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index a537246c568..9a00ef01bb0 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index d64b1860f27..8879f0d5115 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ko.po b/addons/crm/i18n/ko.po
index 8b60dae97da..e663f5c50eb 100644
--- a/addons/crm/i18n/ko.po
+++ b/addons/crm/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index dc90e38b69f..afabc365bad 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/lv.po b/addons/crm/i18n/lv.po
index 25315787c0d..2d507a28770 100644
--- a/addons/crm/i18n/lv.po
+++ b/addons/crm/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 99a3fe310a6..991711d1682 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/nl_BE.po b/addons/crm/i18n/nl_BE.po
index 91fd752e0fd..9191abe9c37 100644
--- a/addons/crm/i18n/nl_BE.po
+++ b/addons/crm/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 95a32c5f7b8..aa4282ecc39 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-13 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+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 73e9eded2ba..f90c62ca5cc 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index f34b010d995..22ee8947778 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ro.po b/addons/crm/i18n/ro.po
index 2eece148a39..bfdc959cf45 100644
--- a/addons/crm/i18n/ro.po
+++ b/addons/crm/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index d20e5a714a1..245922f88b2 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2009-12-16 08:44+0000\n"
-"Last-Translator: Casufi <Unknown>\n"
+"PO-Revision-Date: 2010-04-14 03:53+0000\n"
+"Last-Translator: grisha <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-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -107,7 +107,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
 msgid "Human Resources"
-msgstr ""
+msgstr "Кадры"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
@@ -129,7 +129,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Обычное или селекторное совещание по поводу"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim2
@@ -144,7 +144,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Внимание!"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
@@ -172,7 +172,7 @@ msgstr ""
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr ""
+msgstr "Длительность(в часах)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index 29a95a09f36..65c62d775b2 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sl.po b/addons/crm/i18n/sl.po
index 722c0ef5fd6..20e2333736b 100644
--- a/addons/crm/i18n/sl.po
+++ b/addons/crm/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index f0021b004b3..dd11e334922 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/tlh.po b/addons/crm/i18n/tlh.po
index a4ab5b8708e..0603f88a439 100644
--- a/addons/crm/i18n/tlh.po
+++ b/addons/crm/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+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 da68aa13c15..914c11fa437 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/uk.po b/addons/crm/i18n/uk.po
index 47ec25200b6..8ed0e83a9c4 100644
--- a/addons/crm/i18n/uk.po
+++ b/addons/crm/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index bcce5100fb9..8cdd631c1cc 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -95,7 +95,7 @@ msgstr "阶段名称"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
 #: model:ir.ui.menu,name:crm.next_id_51
 msgid "Cases"
-msgstr "案例"
+msgstr "业务个案"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -220,7 +220,7 @@ msgstr "业务伙伴"
 #: field:crm.case.stage,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
-msgstr "案例组"
+msgstr "业务个案项"
 
 #. module: crm
 #: view:crm.job:0
@@ -341,7 +341,7 @@ msgstr "日期"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr "分割测试"
+msgstr "细分测试"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -417,7 +417,7 @@ msgstr ""
 #: field:crm.menu.config_wizard,opportunity:0
 #: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
 msgid "Business Opportunities"
-msgstr "销售机会"
+msgstr "商机"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
@@ -429,12 +429,12 @@ msgstr ""
 msgid ""
 "The rule use a AND operator. The case must match all non empty fields so "
 "that the rule execute the action described in the 'Actions' tab."
-msgstr "使用规则和操作.这业务个案必须符合所有非空字段所以这规则执行动作描述在动作标签."
+msgstr "该规则使用AND操作符.这业务个案必须是非空字段,而且该规则的执行动作描述在动作标签."
 
 #. module: crm
 #: field:crm.case,history_line:0
 msgid "Communication"
-msgstr "通讯"
+msgstr "沟通"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -496,7 +496,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(partner)s = Partner name"
-msgstr "%(partner)s = Partner name"
+msgstr "%(partner)s = 业务伙伴名称"
 
 #. module: crm
 #: view:crm.case:0
@@ -506,7 +506,7 @@ msgstr "%(partner)s = Partner name"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Action Information"
-msgstr "行动信息"
+msgstr "动作信息"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -522,7 +522,7 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
 #. module: crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义使用了无效的模快名。"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -532,7 +532,7 @@ msgstr "条件"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
 msgid "Open Cases"
-msgstr "待办案例"
+msgstr "待处理业务个案"
 
 #. module: crm
 #: field:crm.case.log,name:0
@@ -636,7 +636,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_id)s = Case ID"
-msgstr "%(case_id)s = 案例标识符"
+msgstr "%(case_id)s = 业务个案ID"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
@@ -670,7 +670,7 @@ msgstr "电话呼叫说明"
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "案例分类"
+msgstr "业务个案分类"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -691,7 +691,7 @@ msgstr ""
 #, python-format
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
-msgstr "您必须指定负责这个案例的用户，才能够执行此行动！"
+msgstr "您必须指定业务个案的责任用户，才能够执行此动作！"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -828,7 +828,7 @@ msgstr "这电子邮件地址设定在这业务个案项所有'回复'的电子
 #: view:crm.case.rule:0
 #: model:ir.model,name:crm.model_crm_case_rule
 msgid "Case Rule"
-msgstr "案例规则"
+msgstr "业务个案规则"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -881,7 +881,7 @@ msgstr "继续"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Periode"
-msgstr "每段日期的天数"
+msgstr "周期天数"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -910,7 +910,7 @@ msgstr "检查如果分类是仅限于业务伙伴匹配的细分标准.如果
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr "排除的"
+msgstr "唯一的"
 
 #. module: crm
 #: help:crm.case,categ_id:0
@@ -1082,7 +1082,7 @@ msgstr "计划成本"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_history
 msgid "Case history"
-msgstr "案例记录"
+msgstr "业务个案日志"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
@@ -1097,7 +1097,7 @@ msgstr "我的会议列表"
 #. module: crm
 #: field:crm.case.categ,name:0
 msgid "Case Category Name"
-msgstr "案例分类名称"
+msgstr "业务个案分类名称"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
@@ -1107,7 +1107,7 @@ msgstr "预防"
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
 msgid "Add watchers (Cc)"
-msgstr "新增监察者"
+msgstr "新增关注者"
 
 #. module: crm
 #: wizard_view:caldav.crm.export,init:0
@@ -1148,7 +1148,7 @@ msgstr "业务个案条件字段"
 #. module: crm
 #: field:crm.case,date_action_next:0
 msgid "Next Action"
-msgstr "下个行动日期"
+msgstr "下一动作"
 
 #. module: crm
 #: view:crm.case:0
@@ -1173,7 +1173,7 @@ msgstr "分类名称"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "业务伙伴分割"
+msgstr "业务伙伴细分"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1183,7 +1183,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of case"
-msgstr "案例分类"
+msgstr "业务个案分类"
 
 #. module: crm
 #: field:crm.email.add.cc,subject:0
@@ -1283,7 +1283,7 @@ msgstr "候选人被拒绝"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
-msgstr "计算分割"
+msgstr "计算细分"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1313,7 +1313,7 @@ msgstr "会议"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(partner_email)s = Partner email"
-msgstr "%(partner_email)s = Partner email"
+msgstr "%(partner_email)s = 业务伙伴电子邮箱"
 
 #. module: crm
 #: view:crm.case:0
@@ -1324,7 +1324,7 @@ msgstr "%(partner_email)s = Partner email"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Reset to Draft"
-msgstr "返回至草稿"
+msgstr "重置为草稿"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
@@ -1343,7 +1343,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.act_res_partner_canal_2_crm_case_opened
 #: model:ir.actions.act_window,name:crm.act_res_users_2_crm_case_opened
 msgid "Open cases"
-msgstr "待办案例"
+msgstr "待处理业务个案"
 
 #. module: crm
 #: field:crm.case,stage_id:0
@@ -1412,7 +1412,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr "已处理最大伙伴标识码"
+msgstr "已处理最大业务伙伴ID"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1568,7 +1568,7 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
-msgstr "分割说明"
+msgstr "细分说明"
 
 #. module: crm
 #: help:crm.meeting,location:0
@@ -1621,7 +1621,7 @@ msgstr "发送提醒"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "References"
-msgstr "参照"
+msgstr "参考"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1658,7 +1658,7 @@ msgstr "取消"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "您的公司找不到邮箱ID"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -1678,7 +1678,7 @@ msgstr ""
 #. module: crm
 #: view:res.partner.events:0
 msgid "General Description"
-msgstr "一般说明"
+msgstr "普通说明"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1699,7 +1699,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,ref:0
 msgid "Reference"
-msgstr "参照"
+msgstr "参考"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
@@ -1734,7 +1734,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_mail_body:0
 msgid "Mail body"
-msgstr "邮件正文"
+msgstr "邮件内容"
 
 #. module: crm
 #: help:crm.menu.config_wizard,meeting:0
@@ -1796,7 +1796,7 @@ msgstr ""
 msgid ""
 "No E-Mail ID Found for your Company address or missing reply address in "
 "section!"
-msgstr ""
+msgstr "无您公司地址的邮箱ID或缺少该项的回复地址!"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -1822,7 +1822,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Actions"
-msgstr "行动"
+msgstr "动作"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -2018,7 +2018,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,trg_priority_to:0
 msgid "Maximim Priority"
-msgstr "最大优先2"
+msgstr "最大优先"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
@@ -2093,7 +2093,7 @@ msgstr "发送"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Priority"
-msgstr "优先级"
+msgstr "优先级(0=紧急)"
 
 #. module: crm
 #: view:crm.opportunity:0
@@ -2128,7 +2128,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.section:0
 msgid "Case section"
-msgstr "案例分部"
+msgstr "业务个案项"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -2329,7 +2329,7 @@ msgstr ""
 msgid ""
 "No E-Mail ID Found for the Responsible Partner or missing reply address in "
 "section!"
-msgstr ""
+msgstr "没有找到业务伙伴的邮箱地址"
 
 #. module: crm
 #: view:crm.job:0
@@ -2516,12 +2516,12 @@ msgstr "生效"
 msgid ""
 "Check this if you want that all documents attached to the case be attached "
 "to the reminder email sent."
-msgstr "如果你想将业务个案的所有附属文档附在提醒电子邮件发送估计勾选此项"
+msgstr "如果你想将业务个案的所有附属文档附在提醒电子邮件发送勾选此项"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr "不可省略表达式"
+msgstr "必填表达式"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -2575,7 +2575,7 @@ msgstr ""
 #: wizard_field:crm.lead.opportunity_set,create_partner,action:0
 #: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Action"
-msgstr "行动"
+msgstr "动作"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -2591,7 +2591,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr "下降系数(0.0－1.0)"
+msgstr "下降因子(0.0>1.0)"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_case_history_event
@@ -2654,7 +2654,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
-msgstr "最长时间间隔"
+msgstr "最大值"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
@@ -2724,7 +2724,7 @@ msgstr ""
 #: field:crm.opportunity.assign_wizard,user_id:0
 #: field:crm.phonecall.assign_wizard,user_id:0
 msgid "Responsible"
-msgstr "责任人"
+msgstr "负责人"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim4
@@ -2754,7 +2754,7 @@ msgstr ""
 msgid ""
 "You can not escalate this case.\n"
 "You are already at the top level."
-msgstr "您不能提升已在最高层次的案例。"
+msgstr "已是最高级别的业务个案你不能再提升"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2842,7 +2842,7 @@ msgstr ""
 msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
-msgstr "计算是建立在此会计期间发生的所有事件.在过去X会计期间"
+msgstr "对在此期间所有事件进行计算"
 
 #. module: crm
 #: field:crm.case,case_id:0
@@ -2862,7 +2862,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.log,user_id:0
 msgid "User Responsible"
-msgstr "责任人"
+msgstr "负责的用户"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
@@ -2893,7 +2893,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm
 #: field:crm.case,log_ids:0
@@ -2919,7 +2919,7 @@ msgstr "继续处理"
 #. module: crm
 #: view:crm.case.history:0
 msgid "Case Description"
-msgstr "案例描述"
+msgstr "业务个案说明"
 
 #. module: crm
 #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
@@ -2930,7 +2930,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,date_action_last:0
 msgid "Last Action"
-msgstr "最后行动日期"
+msgstr "最近动作"
 
 #. module: crm
 #: field:crm.case,duration:0
@@ -2990,7 +2990,7 @@ msgstr ""
 #: view:crm.segmentation:0
 #: field:crm.segmentation.line,segmentation_id:0
 msgid "Segmentation"
-msgstr "分割"
+msgstr "细分"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -3021,7 +3021,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr "运行中"
+msgstr "正在运行"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3140,7 +3140,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr "操作员"
+msgstr "运算符"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_log
@@ -3155,7 +3155,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_subject)s = Case subject"
-msgstr "%(case_subject)s = 案例主题"
+msgstr "%(case_subject)s = 业务个案主题"
 
 #. module: crm
 #: field:crm.case,section_id:0
@@ -3173,7 +3173,7 @@ msgstr "%(case_subject)s = 案例主题"
 #: field:report.crm.case.section.categ2,section_id:0
 #: field:report.crm.case.section.stage,section_id:0
 msgid "Section"
-msgstr "案例分部"
+msgstr "项"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -3199,7 +3199,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,description:0
 msgid "Your action"
-msgstr "您的方式"
+msgstr "你的动作"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead3
@@ -3207,7 +3207,7 @@ msgstr "您的方式"
 #: field:crm.email.add.cc,email:0
 #: view:crm.job:0
 msgid "Email"
-msgstr "电子邮件"
+msgstr "Email"
 
 #. module: crm
 #: field:crm.case,canal_id:0
@@ -3371,7 +3371,9 @@ msgid ""
 "purchased or buy for a too long time, so we suppose that his state of mind "
 "has decreased because he probably bought goods to another supplier. Use this "
 "functionality for recurring businesses."
-msgstr "在销售和采购两个周期的平均天数.它主要用来检查一个业务伙伴没有采购或购买的最长时间,所以我们假设他找了另一个供应商."
+msgstr ""
+"在两个购买或者采购间的平均天数。它主要用来检查一个业务伙伴没有采购或购买的最长时间。如果很长那么我们假设他找了另一个供应商买到了好的货物对我们的满意度下降"
+"。这个功能用在经常性的业务中。"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3431,7 +3433,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,ref2:0
 msgid "Reference 2"
-msgstr "参照2"
+msgstr "参考2"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -3509,7 +3511,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_section_id:0
 msgid "Set section to"
-msgstr "设置分部为"
+msgstr "设置项为"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -3517,7 +3519,7 @@ msgstr "设置分部为"
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Normal"
-msgstr "一般"
+msgstr "普通"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3579,7 +3581,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Section"
-msgstr "上级分部"
+msgstr "上级项"
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
@@ -3644,7 +3646,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,partner_address_id:0
 msgid "Partner Contact"
-msgstr "业务伙伴分类"
+msgstr "业务伙伴联系方式"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet1
@@ -3671,7 +3673,7 @@ msgstr "估计"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Responsible User"
-msgstr "负责人"
+msgstr "负责用户"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3779,7 +3781,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr "命令/非强制的"
+msgstr "命令/可选的"
 
 #. module: crm
 #: wizard_button:caldav.crm.import,init,open:0
@@ -3801,7 +3803,7 @@ msgstr ""
 #: model:res.request.link,name:crm.req_link_case
 #, python-format
 msgid "Case"
-msgstr "案例"
+msgstr "业务个案"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -3898,7 +3900,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.log:0
 msgid "Case logs"
-msgstr "案例记录"
+msgstr "业务个案日志"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3920,7 +3922,7 @@ msgstr ""
 #: field:crm.case.section,sequence:0
 #: field:crm.case.stage,sequence:0
 msgid "Sequence"
-msgstr "序列"
+msgstr "序号"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
@@ -3942,7 +3944,7 @@ msgstr "控制变量"
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act_tree
 msgid "Cases by section"
-msgstr "按分部排列的案例"
+msgstr "业务个案项"
 
 #. module: crm
 #: view:crm.job:0
@@ -4004,9 +4006,6 @@ msgstr ""
 #~ msgid "Create menu Entries"
 #~ msgstr "创建菜单"
 
-#~ msgid "All Unclosed and Unassigned "
-#~ msgstr "所有未关闭和未指定 "
-
 #~ msgid "New "
 #~ msgstr "新 "
 
@@ -4016,8 +4015,11 @@ msgstr ""
 #~ msgid "Select Views (empty for default)"
 #~ msgstr "选择视图(默认为空)"
 
-#~ msgid "Mail to watchers (Cc)"
-#~ msgstr "发送到监察者"
+#~ msgid "My cases"
+#~ msgstr "我的业务个案"
+
+#~ msgid "My Open Cases"
+#~ msgstr "我待处理的业务个案"
 
 #~ msgid "All Late "
 #~ msgstr "所有延迟 "
@@ -4028,17 +4030,9 @@ msgstr ""
 #~ msgid "My Unclosed "
 #~ msgstr "我未关闭 "
 
-#~ msgid "My Pending "
-#~ msgstr "我未决 "
-
 #~ msgid "New Form"
 #~ msgstr "新表单"
 
-#~ msgid ""
-#~ "These people will receive a copy of the futur communication between partner "
-#~ "and users by email"
-#~ msgstr "将收到一份未来业务伙伴和用户之间沟通的电子邮件"
-
 #~ msgid "New With Calendar"
 #~ msgstr "新日程表"
 
@@ -4064,9 +4058,6 @@ msgstr ""
 #~ msgid "All Unclosed "
 #~ msgstr "所有未关闭 "
 
-#~ msgid "Tree View"
-#~ msgstr "树"
-
 #~ msgid "Create Menus For Cases"
 #~ msgstr "创建业务个案菜单"
 
@@ -4094,14 +4085,5 @@ msgstr ""
 #~ msgid "Excluded Answers :"
 #~ msgstr "排除的答案:"
 
-#~ msgid "Profiling"
-#~ msgstr "轮廓"
-
-#~ msgid "Profiling Options"
-#~ msgstr "轮廓选项"
-
 #~ msgid "Included Answers :"
 #~ msgstr "包括回答:"
-
-#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
-#~ msgstr "计算开始时间+持续时间"
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index 7630146235b..2a4d729e7e7 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/report/crm_claim_report_view.xml b/addons/crm/report/crm_claim_report_view.xml
index 9be2c7c538e..4d544c97711 100644
--- a/addons/crm/report/crm_claim_report_view.xml
+++ b/addons/crm/report/crm_claim_report_view.xml
@@ -10,17 +10,17 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Claims">
-					<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
+                    <field name="name" />
+                    <field name="month"/>
+                    <field name="section_id" />
                     <field name="user_id" />
                     <field name="company_id" />
                     <field name="partner_id" />
-					<field name="nbr" string="#Claim"/>
-	                <field name="delay_close"/>
-	                <field name="state"  invisible="1"/>
-	                <field name="stage_id" invisible="1"/>
-	                <field name="categ_id" invisible="1"/>
+                    <field name="nbr" string="#Claim"/>
+                    <field name="delay_close"/>
+                    <field name="state"  invisible="1"/>
+                    <field name="stage_id" invisible="1"/>
+                    <field name="categ_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -34,7 +34,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_costs"/>
                     <field name="amount_revenue_prob"/>
@@ -67,10 +67,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
              <xpath
-             	expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
-             	position='after'>
-             	<filter string="Stage" icon="terp-sale" domain="[]"
-             		context="{'group_by':'stage_id'}" />
+                 expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+                 position='after'>
+                 <filter string="Stage" icon="terp-sale" domain="[]"
+                     context="{'group_by':'stage_id'}" />
              </xpath>
             </field>
         </record>
@@ -81,29 +81,30 @@
             <field name="name">Claims</field>
             <field name="res_model">crm.claim.report</field>
             <field name="view_type">form</field>
-  			<field name="view_mode">tree,graph</field>
+              <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_claim_tree"/>
-            <field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
             <field name="search_view_id" ref="view_report_crm_claim_filter"/>
 
         </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_claim_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_claim"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_claim_tree"/>
+            <field name="act_window_id" ref="action_report_crm_claim"/>
+        </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_claim_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_claim_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_claim"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_claim_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_claim_graph"/>
+            <field name="act_window_id" ref="action_report_crm_claim"/>
+        </record>
 
-       	<menuitem name="Claims" id="menu_report_crm_claim_tree"
-       		action="action_report_crm_claim" parent="base.next_id_64" />
+       <menuitem name="Claims" id="menu_report_crm_claim_tree"
+           groups="base.group_extended"
+           action="action_report_crm_claim" parent="base.next_id_64" />
 
 
     </data>
diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml
index 38068a7b16c..c051ab8dcb8 100644
--- a/addons/crm/report/crm_fundraising_report_view.xml
+++ b/addons/crm/report/crm_fundraising_report_view.xml
@@ -9,14 +9,14 @@
             <field name="model">crm.fundraising.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Fundraising">
-	              	<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
+                <tree string="Fundraising">
+                      <field name="name" />
+                    <field name="month"/>
+                    <field name="section_id" />
                     <field name="user_id" />
-    				<field name="company_id" />
+                    <field name="company_id" />
                     <field name="partner_id" />
-                	<field name="nbr" string="#Fundraising"/>
+                    <field name="nbr" string="#Fundraising"/>
                     <field name="amount_revenue"  sum="Total Revenue"/>
                     <field name="probability"/>
                     <field name="amount_revenue_prob"/>
@@ -36,7 +36,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -80,28 +80,29 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_fundraising_tree"/>
-			<field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
             <field name="search_view_id" ref="view_report_crm_fundraising_filter"/>
         </record>
 
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_fundraising_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_fundraising"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_fundraising_tree"/>
+            <field name="act_window_id" ref="action_report_crm_fundraising"/>
+        </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_fundrising_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_fundraising_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_fundraising"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_fundraising_graph"/>
+            <field name="act_window_id" ref="action_report_crm_fundraising"/>
+        </record>
 
         <menuitem name="Fundraising"
-        	action="action_report_crm_fundraising"
-        	id="menu_report_crm_fundraising_tree" parent="base.next_id_64" />
+            action="action_report_crm_fundraising"
+            groups="base.group_extended"
+            id="menu_report_crm_fundraising_tree" parent="base.next_id_64" />
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_helpdesk_report_view.xml b/addons/crm/report/crm_helpdesk_report_view.xml
index ba4e3be7ed2..0852d343c95 100644
--- a/addons/crm/report/crm_helpdesk_report_view.xml
+++ b/addons/crm/report/crm_helpdesk_report_view.xml
@@ -10,18 +10,18 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Helpdesk">
-					<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
+                    <field name="name" />
+                    <field name="month"/>
+                    <field name="section_id" />
                     <field name="user_id" />
                     <field name="company_id"/>
                     <field name="partner_id" />
                     <field name="date_deadline" invisible="1"/>
                     <field name="priority" invisible="1"/>
-					<field name="nbr" string="#Helpdesk" />
-	                <field name="delay_close"/>
+                    <field name="nbr" string="#Helpdesk" />
+                    <field name="delay_close"/>
                     <field name="state" invisible="1"/>
-				</tree>
+                </tree>
             </field>
         </record>
 
@@ -34,7 +34,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -59,46 +59,46 @@
 
 <!-- Helpdesk report after Sales Services Search View -->
 
-		<record id="view_report_crm_helpdesk_filter" model="ir.ui.view">
+        <record id="view_report_crm_helpdesk_filter" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.select</field>
             <field name="model">crm.helpdesk.report</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="9">
-                   		<filter string="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]"
-                   			name="this_year" />
+                           <filter string="This Year" icon="terp-hr"
+                               domain="[('name','=',time.localtime()[0])]"
+                               name="this_year" />
 
-                   		<filter string="This Month" icon="terp-hr"
-                   			domain="[('month','=',time.strftime('%%m'))]"
-                   			name="this_month" />
+                           <filter string="This Month" icon="terp-hr"
+                               domain="[('month','=',time.strftime('%%m'))]"
+                               name="this_month" />
 
-                   		<separator orientation="vertical" />
-                   		<filter string="Current" icon="terp-hr"
-                   			domain="[('state','in',('open','draft'))]" />
+                           <separator orientation="vertical" />
+                           <filter string="Current" icon="terp-hr"
+                               domain="[('state','in',('open','draft'))]" />
 
-                   		<filter string="Won" icon="terp-hr"
-                   			domain="[('state','=','done')]" />
+                           <filter string="Won" icon="terp-hr"
+                               domain="[('state','=','done')]" />
 
-                   		<filter string="Lost" icon="terp-hr"
-                   			domain="[('state','=','cancel')]" />
+                           <filter string="Lost" icon="terp-hr"
+                               domain="[('state','=','cancel')]" />
 
-                   		<filter string="Deadline" icon="terp-hr"
-                   			domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" />
+                           <filter string="Deadline" icon="terp-hr"
+                               domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" />
 
-                   		<separator orientation="vertical" />
-                   		<field name="section_id"
-                   			widget="selection"
-                   			context="{'invisible_section': False}">
+                           <separator orientation="vertical" />
+                           <field name="section_id"
+                               widget="selection"
+                               context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
-                   				context="{'invisible_section': False}"
-                   				domain="[('section_id.user_id','=',uid)]"
-                   				help="My section" />
+                               <filter icon="terp-crm"
+                                   context="{'invisible_section': False}"
+                                   domain="[('section_id.user_id','=',uid)]"
+                                   help="My section" />
 
-                   		</field>
-                   		<field name="company_id" widget="selection">
+                           </field>
+                           <field name="company_id" widget="selection">
 
                            <filter icon="terp-crm"
                         context="{'invisible_section': False}"
@@ -111,24 +111,24 @@
                    <newline/>
                    <group expand="1" string="Extended options..." colspan="4" col="5">
                         <filter icon="terp-sale"
-                    		string="Lowest"
-                    		domain="[('priority','=','5')]"/>
+                            string="Lowest"
+                            domain="[('priority','=','5')]"/>
 
-                    	<filter icon="terp-sale"
-                    		string="Low"
-                    		domain="[('priority','=','4')]"/>
+                        <filter icon="terp-sale"
+                            string="Low"
+                            domain="[('priority','=','4')]"/>
 
-                    	<filter icon="terp-sale"
-                    		string="Normal"
-                    		domain="[('priority','=','3')]"/>
+                        <filter icon="terp-sale"
+                            string="Normal"
+                            domain="[('priority','=','3')]"/>
 
-                    	<filter icon="terp-sale"
-                    		string="High"
-                    		domain="[('priority','=','2')]"/>
+                        <filter icon="terp-sale"
+                            string="High"
+                            domain="[('priority','=','2')]"/>
 
-                    	<filter icon="terp-sale"
-                    		string="Highest"
-                    		domain="[('priority','=','1')]"/>
+                        <filter icon="terp-sale"
+                            string="Highest"
+                            domain="[('priority','=','1')]"/>
 
                    </group>
                    <newline/>
@@ -137,30 +137,30 @@
 
                   <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
+                            domain="[]" context="{'group_by':'user_id'}" />
 
                         <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
+                            domain="[]"
+                            context="{'group_by':'company_id'}" />
 
                         <filter string="Section" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
+                            domain="[]" context="{'group_by':'state'}" />
 
                         <filter string="Partner" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'partner_id'}" />
+                            domain="[]"
+                            context="{'group_by':'partner_id'}" />
 
                         <separator orientation="vertical" />
                         <filter string="Month" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'month'}" />
+                            domain="[]" context="{'group_by':'month'}" />
 
                         <filter string="Year" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'name'}" />
+                            domain="[]" context="{'group_by':'name'}" />
 
                   </group>
                </search>
@@ -179,22 +179,23 @@
             <field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
         </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_helpdesk"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
+            <field name="act_window_id" ref="action_report_crm_helpdesk"/>
+        </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_helpdesk_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_helpdesk"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_helpdesk_graph"/>
+            <field name="act_window_id" ref="action_report_crm_helpdesk"/>
+        </record>
 
         <menuitem name="Helpdesk" action="action_report_crm_helpdesk"
-        	id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" />
+            groups="base.group_extended"
+            id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" />
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 9ce910329bf..30c1ab2135c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -10,16 +10,16 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree string="Leads">
-				<field name="name" />
-				<field name="month"/>
-				<field name="section_id" />
-				<field name="user_id" />
-    			<field name="company_id" />
-				<field name="partner_id" />
-				<field name="nbr" string="#Leads"/>
+                <field name="name" />
+                <field name="month"/>
+                <field name="section_id" />
+                <field name="user_id" />
+                <field name="company_id" />
+                <field name="partner_id" />
+                <field name="nbr" string="#Leads"/>
                 <field name="delay_close"/>
                 <field name="state"  invisible="1"/>
-				<field name="stage_id"  invisible="1"/>
+                <field name="stage_id"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
              </tree>
             </field>
@@ -34,8 +34,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
-                	<field name="stage_id"/>
+                    <field name="delay_close"/>
+                    <field name="stage_id"/>
                 </field>
             </field>
         </record>
@@ -63,12 +63,12 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-			<xpath
-				expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
-				position='after'>
-				<filter string="Stage" icon="terp-sale" domain="[]"
-					context="{'group_by':'stage_id'}" />
-			</xpath>
+            <xpath
+                expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+                position='after'>
+                <filter string="Stage" icon="terp-sale" domain="[]"
+                    context="{'group_by':'stage_id'}" />
+            </xpath>
             </field>
         </record>
 
@@ -79,27 +79,28 @@
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>            
             <field name="search_view_id" ref="view_report_crm_lead_filter"/>
 
         </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_lead_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_lead"/>
-	    </record>
+       <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_lead_tree"/>
+            <field name="act_window_id" ref="action_report_crm_lead"/>
+       </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_lead_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_lead_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_lead"/>
-	    </record>
+       <record model="ir.actions.act_window.view" id="action_report_crm_lead_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_lead_graph"/>
+            <field name="act_window_id" ref="action_report_crm_lead"/>
+       </record>
 
-       	<menuitem name="Leads" id="menu_report_crm_leads_tree"
-       		parent="base.next_id_64" action="action_report_crm_lead" />
+       <menuitem name="Leads" id="menu_report_crm_leads_tree"
+           groups="base.group_extended"
+           parent="base.next_id_64" action="action_report_crm_lead" />
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index 1e917d83710..36dec45ddf7 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -29,10 +29,11 @@ class crm_opportunity_report(osv.osv):
     _inherit = "crm.case.report"
     _description = "CRM Opportunity Report"
     _columns = {
-        'probability': fields.float('Avg. Probability', readonly=True),
+        'probability': fields.float('Avg. Probability', readonly=True, group_operator="avg"),
         'amount_revenue': fields.float('Est.Revenue', readonly=True),
         'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
-        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+        'delay_close': fields.float('Days to Close', digits=(16,2), readonly=True, group_operator="avg",
+            help="Number of Days to close the opportunities"),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                      domain="[('section_id','=',section_id),\
                     ('object_id.model', '=', 'crm.opportunity')]", readonly=True),
@@ -70,7 +71,7 @@ class crm_opportunity_report(osv.osv):
                     sum(planned_revenue) as amount_revenue,
                     sum((planned_revenue*probability)/100.0)::decimal(16,2) as amount_revenue_prob,
                     avg(probability)::decimal(16,2) as probability,
-                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                    avg(extract('epoch' from (date_closed-c.create_date)))/(3600*24) as delay_close
                 from
                     crm_opportunity c
                 group by
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
index b19115f6739..58768ebceef 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_view.xml
@@ -9,14 +9,14 @@
             <field name="model">crm.opportunity.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Opportunities">
-	              	<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
-                    <field name="user_id" />
-                    <field name="company_id"/>
-					<field name="partner_id"/>
-                	<field name="nbr" string="#Opportunities"/>
+                <tree string="Opportunities">
+                    <field name="name"  invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="section_id"  invisible="1"/>
+                    <field name="user_id"  invisible="1"/>
+                    <field name="company_id" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
+                    <field name="nbr" string="#Opportunities"/>
                     <field name="amount_revenue"  sum="Total Revenue"/>
                     <field name="probability" widget="progressbar"/>
                     <field name="amount_revenue_prob"/>
@@ -37,7 +37,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_costs"/>
                     <field name="amount_revenue_prob"/>
@@ -69,15 +69,15 @@
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-				<xpath
-					expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
-					position='after'>
-					<filter string="Stage" icon="terp-sale" domain="[]"
-						context="{'group_by':'stage_id'}" />
-					<separator orientation="vertical" />
-					<filter string="Partner" icon="terp-partner"
-						domain="[]" context="{'group_by':'partner_id'}" />
-				</xpath>
+                <xpath
+                    expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+                    position='after'>
+                    <filter string="Stage" icon="terp-sale" domain="[]"
+                        context="{'group_by':'stage_id'}" />
+                    <separator orientation="vertical" />
+                    <filter string="Partner" icon="terp-partner"
+                        domain="[]" context="{'group_by':'partner_id'}" />
+                </xpath>
             </field>
         </record>
 
@@ -88,25 +88,25 @@
             <field name="res_model">crm.opportunity.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1, "group_by": [], 'group_by_no_leaf': 1}</field>
             <field name="search_view_id" ref="view_report_crm_opportunity_filter"/>
         </record>
-      	<record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_opportunity_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_opportunity"/>
-	    </record>
+          <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_opportunity_tree"/>
+            <field name="act_window_id" ref="action_report_crm_opportunity"/>
+        </record>
         <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_opportunity_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_opportunity"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_opportunity_graph"/>
+            <field name="act_window_id" ref="action_report_crm_opportunity"/>
+        </record>
 
         <menuitem name="Opportunities"
-        	action="action_report_crm_opportunity"
-        	id="menu_report_crm_opportunity_tree" parent="base.next_id_64" />
+            action="action_report_crm_opportunity"
+            id="menu_report_crm_opportunity_tree" parent="base.next_id_64" />
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index a4fc0f0097f..e937ef6bd22 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -10,17 +10,17 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Phone calls">
-					<field name="name" />
-					<field name="month"/>
-					<field name="section_id" />
+                    <field name="name" />
+                    <field name="month"/>
+                    <field name="section_id" />
                     <field name="user_id" />
                     <field name="company_id"/>
                     <field name="partner_id" />
-					<field name="nbr" string="#Phone calls" />
-	                <field name="delay_close"/>
+                    <field name="nbr" string="#Phone calls" />
+                    <field name="delay_close"/>
                     <field name="state" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
-				</tree>
+                </tree>
             </field>
         </record>
 
@@ -33,7 +33,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
-                	<field name="delay_close"/>
+                    <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -77,27 +77,28 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_phonecall_tree"/>
-            <field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>            
             <field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
         </record>
 
-       	<record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_crm_phonecall_tree"/>
-	        <field name="act_window_id" ref="action_report_crm_phonecall"/>
-	    </record>
+           <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_phonecall_tree"/>
+            <field name="act_window_id" ref="action_report_crm_phonecall"/>
+        </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_crm_phonecall_graph"/>
-	        <field name="act_window_id" ref="action_report_crm_phonecall"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_phonecall_graph"/>
+            <field name="act_window_id" ref="action_report_crm_phonecall"/>
+        </record>
 
         <menuitem name="Phone Calls"
-        	action="action_report_crm_phonecall"
-        	id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
+            action="action_report_crm_phonecall"
+            groups="base.group_extended"
+            id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
 
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index a0f03a24210..3cd8b518b5d 100644
--- a/addons/crm/report/crm_report_view.xml
+++ b/addons/crm/report/crm_report_view.xml
@@ -64,10 +64,12 @@
                 <search string="Search">
                   <group col="16" colspan="8">
                    		<filter string="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]" />
+                   			domain="[('name','=',time.localtime()[0])]"
+                   			name="this_year" />
 
                    		<filter string="This Month" icon="terp-hr"
-                   			domain="[('month','=',time.strftime('%%m'))]" />
+                   			domain="[('month','=',time.strftime('%%m'))]"
+                   			name="this_month" />
 
                    		<separator orientation="vertical" />
                    		<filter string="Current" icon="terp-hr"
@@ -104,7 +106,8 @@
                    <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
+                        	domain="[]" context="{'group_by':'user_id'}"
+                        	name="by_user" />
 
                         <filter string="Company" icon="terp-sale"
                         	domain="[]"
@@ -142,7 +145,7 @@
             <field name="res_model">crm.case.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1}</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1}</field>            
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
 
diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 1417aa71ddf..bb0adb0444a 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -67,9 +67,9 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
     
     soup = BeautifulSoup(html, parseOnlyThese=strainer, fromEncoding=encoding)
     for link in soup.findAll('a'):
-        title = link.renderContents()
+        title = unicode(link)
         for url in [x[1] for x in link.attrs if x[0]=='href']:
-            urls.append(dict(url=url, tag=str(link), title=title))
+            urls.append(dict(url=url, tag=unicode(link), title=title))
 
     html = unicode(soup)
             
@@ -162,12 +162,9 @@ class email_parser(object):
            if charset:
                try:
                    return s.decode(charset)
-               except UnicodeError:  
-                    pass         
-       try:
-           return s.decode('ascii')
-       except UnicodeError:
-           return s 
+               except UnicodeError:
+                    pass
+       return s.decode('latin1')
 
     def _decode_header(self, s):
         from email.Header import decode_header
@@ -285,7 +282,7 @@ class email_parser(object):
             if actions['state'] in ['draft', 'close', 'cancel', 'open', 'pending']:
                 act = 'case_' + actions['state']
 
-        for k1, k2 in [('cost', 'planned_cost'), ('revenue', 'planned_revenue'), ('probability', 'probability')]:
+            for k1, k2 in [('cost', 'planned_cost'), ('revenue', 'planned_revenue'), ('probability', 'probability')]:
             try:
                 data[k2] = float(actions[k1])
             except:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 6d96016b8ae..f4b97ad2f14 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -77,6 +77,7 @@ class crm_lead2opportunity(osv.osv_memory):
             for this in self.browse(cr, uid, ids, context=context):
                 new_opportunity_id = opp_obj.create(cr, uid, {
                         'name': this.name, 
+                        'referred': this.referred,
                         'planned_revenue': this.planned_revenue, 
                         'probability': this.probability, 
                         'partner_id': lead.partner_id and lead.partner_id.id or False , 
@@ -89,7 +90,6 @@ class crm_lead2opportunity(osv.osv_memory):
                         'phone': lead.phone, 
                         'email_from': lead.email_from
                     })
-
                 new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
                 vals = {
                         'partner_id': this.partner_id and this.partner_id.id or False, 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index eefd438c368..229b54e09fe 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,61 +1,63 @@
 <openerp>
-  	<data>
+      <data>
 
-		<!-- Lead to Opportunity view -->
+        <!-- Lead to Opportunity view -->
 
-  		<record id="view_crm_lead2opportunity_create" model="ir.ui.view">
-	      <field name="name">crm.lead2opportunity.create</field>
-	      <field name="model">crm.lead2opportunity</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Convert To Opportunity">
-		        <field name="name"/>
-		        <field name="partner_id"/>
-		        <newline/>
-		        <field name="planned_revenue"/>
-		        <field name="probability"/>
-		        <group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
-	      		</group>
-		    </form>
-	      </field>
-	   </record>
-	   
-	   <!-- Lead to Opportunity action -->
-	   
-	   <record id="action_crm_lead2opportunity" model="ir.actions.act_window">
-	      <field name="name">Create Opportunity</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.lead2opportunity</field>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	   </record>
+          <record id="view_crm_lead2opportunity_create" model="ir.ui.view">
+          <field name="name">crm.lead2opportunity.create</field>
+          <field name="model">crm.lead2opportunity</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+              <form string="Convert To Opportunity">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <newline/>
+                <field name="planned_revenue"/>
+                <field name="probability"/>
+                <separator colspan="4"/>
+                <group col="4" colspan="4">
+                    <label string="" colspan="2"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
+                </group>
+            </form>
+          </field>
+       </record>
+       
+       <!-- Lead to Opportunity action -->
+       
+       <record id="action_crm_lead2opportunity" model="ir.actions.act_window">
+          <field name="name">Create Opportunity</field>
+          <field name="type">ir.actions.act_window</field>
+          <field name="res_model">crm.lead2opportunity</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">form</field>
+          <field name="target">new</field>
+       </record>
 
 
         <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
-	      <field name="name">crm.lead2opportunity.partner.form</field>
-	      <field name="model">crm.lead2opportunity.partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	 <form string="Create a Partner">
+          <field name="name">crm.lead2opportunity.partner.form</field>
+          <field name="model">crm.lead2opportunity.partner</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+               <form string="Create a Partner">
                 <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
                 <label string="You may have to verify that this partner does not exist already." colspan="4"/>
                 <newline />
-	      		<field name="action"/>
-	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
-		        </group>
-		        <separator string="" colspan="4" />
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/>
-	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
-	      		</group>
+                <field name="action"/>
+                <group attrs="{'invisible':[('action','!=','exist')]}">
+                    <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+                </group>
+                <separator string="" colspan="4" />
+                <group col="4" colspan="4">
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/>
+                    <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+                </group>
             </form>
-	      </field>
-	   </record> 
+          </field>
+       </record> 
 
- 	</data>
+     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 2cd0ab541fe..267c3296844 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -53,42 +53,41 @@ class crm_lead2partner(osv.osv_memory):
                      raise osv.except_osv(_('Warning !'),
                         _('A partner is already defined on this lead.'))
 
-    def _select_partner(self, cr, uid, context=None):
+    def default_get(self, cr, uid, fields, context=None):
         """
-        This function Searches for Partner from selected lead.
+        This function gets default values
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param fields: List of fields for default value
         @param context: A standard dictionary for contextual values
 
-        @return : Partner id if any for selected lead.
+        @return : default values of fields.
         """
-        if not context:
-            context = {}
-
         lead_obj = self.pool.get('crm.lead')
         partner_obj = self.pool.get('res.partner')
         contact_obj = self.pool.get('res.partner.address')
         rec_ids = context and context.get('active_ids', [])
         partner_id = False
 
-        for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
+        data = context and context.get('active_ids', []) or []
+        res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)
+
+        for lead in lead_obj.browse(cr, uid, data, context=context):
             partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
             if not partner_ids and lead.email_from:
                 address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
                 if address_ids:
                     addresses = contact_obj.browse(cr, uid, address_ids)
                     partner_ids = addresses and [addresses[0].partner_id.id] or False
-
             partner_id = partner_ids and partner_ids[0] or False
-        return partner_id
-
-    _defaults = {
-        'action': lambda *a:'exist',
-        'partner_id': _select_partner
-        }
 
+            if 'partner_id' in fields:
+                res.update({'partner_id': partner_id})
+            if 'action' in fields:
+                res.update({'action': partner_id and 'exist' or 'create'})
+        return res
+    
     def open_create_partner(self, cr, uid, ids, context=None):
         """
         This function Opens form of create partner.
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 93897246bf7..434035cd2df 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -56,6 +56,7 @@ class crm_send_new_email(osv.osv_memory):
         """
 
         hist_obj = self.pool.get('crm.case.history')
+        smtp_pool = self.pool.get('email.smtpclient')
 
         if not context:
             context = {}
@@ -69,12 +70,16 @@ class crm_send_new_email(osv.osv_memory):
 
         for data in self.read(cr, uid, ids, context=context):
             attach = filter(lambda x: x, [data['doc1'], data['doc2'], data['doc3']])
-            attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
-
+            attach = map(lambda x: (data['doc' + str(attach.index(x) + 1) \
+                            + '_fname'], base64.decodestring(x)), attach)
+            message_id = None            
+            
+            case = case_pool.browse(cr, uid, res_id)
             if context.get('mail', 'new') == 'new':
-                case = case_pool.browse(cr, uid, res_id)
+                message_id = case.history_line[0].message_id
             else:
                 hist = hist_obj.browse(cr, uid, res_id)
+                message_id = hist.message_id
                 model = hist.log_id.model_id.model
                 model_pool = self.pool.get(model)
                 case = model_pool.browse(cr, uid, hist.log_id.res_id)
@@ -84,17 +89,37 @@ class crm_send_new_email(osv.osv_memory):
 
             body = case_pool.format_body(body)
             email_from = data.get('email_from', False)
-            case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from)
+            case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from, message_id=message_id)
 
-            flag = tools.email_send(
-                email_from,
-                emails,
-                data['subject'],
-                body,
-                attach=attach,
-                reply_to=case.section_id.reply_to,
-                openobject_id=str(case.id),
-            )
+            x_headers = {
+                'References':"%s" % (message_id),
+                'Reply-To':"%s" % case.section_id.reply_to,
+            }
+            flag = False
+            if case.section_id and case.section_id.server_id:
+                
+                flag = smtp_pool.send_email(
+                    cr=cr,
+                    uid=uid, 
+                    server_id=case.section_id.server_id.id,
+                    emailto=emails,
+                    subject=data['subject'],
+                    body="<pre>%s</pre>" % body,
+                    attachments=attach,
+                    headers=x_headers
+                )
+            else:
+                flag = tools.email_send(
+                    email_from,
+                    emails,
+                    data['subject'],
+                    body,
+                    attach=attach,
+                    reply_to=case.section_id.reply_to,
+                    openobject_id=str(case.id),
+                    x_headers=x_headers
+                )
+            
             if flag:
                 if data['state'] == 'unchanged':
                     pass
@@ -107,11 +132,6 @@ class crm_send_new_email(osv.osv_memory):
                     getattr(case_pool, act)(cr, uid, [case.id])
                 cr.commit()
 
-#            Commented because form does not close due to raise
-#                raise osv.except_osv(_('Email!'), ("Email Successfully Sent"))
-#            else:
-#                raise osv.except_osv(_('Warning!'), _("Email not sent !"))
-
         return {}
 
     def default_get(self, cr, uid, fields, context=None):
@@ -157,6 +177,8 @@ class crm_send_new_email(osv.osv_memory):
         """
         hist_obj = self.pool.get('crm.case.history')
         res_ids = context and context.get('active_ids', []) or []
+
+        include_original = context and context.get('include_original', False) or False
         res = {}
         for hist in hist_obj.browse(cr, uid, res_ids):
             model = hist.log_id.model_id.model
@@ -168,7 +190,8 @@ class crm_send_new_email(osv.osv_memory):
                 res.update({'email_from': (case.section_id and case.section_id.reply_to) or \
                             (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or hist.email_to or tools.config.get('email_from',False)})
-            if 'text' in fields:
+
+            if include_original == True and 'text' in fields:
                 header = '-------- Original Message --------'
                 sender = 'From: %s' %(hist.email_from or '')
                 to = 'To: %s' % (hist.email_to or '')
diff --git a/addons/crm_caldav/__terp__.py b/addons/crm_caldav/__openerp__.py
similarity index 100%
rename from addons/crm_caldav/__terp__.py
rename to addons/crm_caldav/__openerp__.py
diff --git a/addons/crm_profiling/__terp__.py b/addons/crm_profiling/__openerp__.py
similarity index 100%
rename from addons/crm_profiling/__terp__.py
rename to addons/crm_profiling/__openerp__.py
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 48810240199..da91dcd7107 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -1,218 +1,218 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<wizard
-			string="Using a questionnaire"
-			model="crm_profiling.questionnaire"
-			name="open_questionnaire"
-			menu="False"
-			id="wizard_open_questionnaire"/>
+        <wizard
+            string="Using a questionnaire"
+            model="crm_profiling.questionnaire"
+            name="open_questionnaire"
+            menu="False"
+            id="wizard_open_questionnaire"/>
 
-		<record model="ir.actions.act_window" id="open_questionnaires">
-		  <field name="name">Questionnaires</field>
-		  <field name="res_model">crm_profiling.questionnaire</field>
-		  <field name="view_type">form</field>
-		  <field name="view_mode">tree,form</field>
-		</record>
-		<menuitem parent="crm.menu_crm_configuration" id="menu_segm_questionnaire"
-				  action="open_questionnaires" />
+        <record model="ir.actions.act_window" id="open_questionnaires">
+          <field name="name">Questionnaires</field>
+          <field name="res_model">crm_profiling.questionnaire</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem parent="crm.menu_crm_configuration" id="menu_segm_questionnaire"
+                  action="open_questionnaires" />
 
 
-		<record model="ir.actions.act_window" id="open_questions">
-		  <field name="name">Questions</field>
-		  <field name="res_model">crm_profiling.question</field>
-		  <field name="view_type">form</field>
-		  <field name="view_mode">tree,form</field>
-		</record>
-		<menuitem parent="crm.menu_crm_configuration" id="menu_segm_answer"
-				  action="open_questions" />
+        <record model="ir.actions.act_window" id="open_questions">
+          <field name="name">Questions</field>
+          <field name="res_model">crm_profiling.question</field>
+          <field name="view_type">form</field>
+          <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem parent="crm.menu_crm_configuration" id="menu_segm_answer"
+                  action="open_questions" />
 
 <!-- Profiling Questionnaire Tree view  -->
 
-	<record model="ir.ui.view" id="view_questionnaire_tree">
-		<field name="name">Questionnaires</field>
-		<field name="model">crm_profiling.questionnaire</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-		  <tree string="Questionnaires">
-			<field name="name" select="1" colspan="4"/>
-			<field name="description" select="1" colspan="4"/>
-			<field name="questions_ids" colspan="4" nolabel="1"/>
-		  </tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_questionnaire_tree">
+        <field name="name">Questionnaires</field>
+        <field name="model">crm_profiling.questionnaire</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+          <tree string="Questionnaires">
+            <field name="name" select="1" colspan="4"/>
+            <field name="description" select="1" colspan="4"/>
+            <field name="questions_ids" colspan="4" nolabel="1"/>
+          </tree>
+        </field>
+    </record>
 
 <!-- Profiling Questionnaire Form view  -->
 
-	<record model="ir.ui.view" id="view_questionnaire_form">
-		<field name="name">Questionnaires</field>
-		<field name="model">crm_profiling.questionnaire</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-		  <form string="Questionnaires">
-			<field name="name" select="1" />
-			<newline/>
-			<separator string="Questions List" colspan="4"/>
-			<field name="questions_ids" colspan="4" nolabel="1"/>
-			<newline/>
-			<separator string="Description" colspan="4"/>
-			<field name="description" colspan="4" select="1" nolabel="1"/>
-		  </form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_questionnaire_form">
+        <field name="name">Questionnaires</field>
+        <field name="model">crm_profiling.questionnaire</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+          <form string="Questionnaires">
+            <field name="name" select="1" />
+            <newline/>
+            <separator string="Questions List" colspan="4"/>
+            <field name="questions_ids" colspan="4" nolabel="1"/>
+            <newline/>
+            <separator string="Description" colspan="4"/>
+            <field name="description" colspan="4" select="1" nolabel="1"/>
+          </form>
+        </field>
+    </record>
 
 <!-- Profiling Answer Tree view  -->
 
-	<record model="ir.ui.view" id="view_answer">
-		<field name="name">Answers</field>
-		<field name="model">crm_profiling.answer</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-		  <tree string="Answers">
-			<field name="question_id" select="1"/>
-			<field name="name" select="1"/>
-		  </tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_answer">
+        <field name="name">Answers</field>
+        <field name="model">crm_profiling.answer</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+          <tree string="Answers">
+            <field name="question_id" select="1"/>
+            <field name="name" select="1"/>
+          </tree>
+        </field>
+    </record>
 
 <!-- Profiling Answer Form view  -->
 
-	<record model="ir.ui.view" id="view_answer_form">
-		<field name="name">Answers</field>
-		<field name="model">crm_profiling.answer</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-		  <form string="Answers">
-			<field name="question_id" select="1"/>
-			<field name="name" select="1"/>
-		  </form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_answer_form">
+        <field name="name">Answers</field>
+        <field name="model">crm_profiling.answer</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+          <form string="Answers">
+            <field name="question_id" select="1"/>
+            <field name="name" select="1"/>
+          </form>
+        </field>
+    </record>
 
 <!-- Profiling Questions Tree view  -->
 
-	<record model="ir.ui.view" id="view_question_tree">
-		<field name="name">Questions</field>
-		<field name="model">crm_profiling.question</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-		  <tree string="Questions">
-			<field name="name" select="1" colspan="4"/>
-			<field name="answers_ids" colspan="4" nolabel="1"/>
-		  </tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_question_tree">
+        <field name="name">Questions</field>
+        <field name="model">crm_profiling.question</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+          <tree string="Questions">
+            <field name="name" select="1" colspan="4"/>
+            <field name="answers_ids" colspan="4" nolabel="1"/>
+          </tree>
+        </field>
+    </record>
 
 <!-- Profiling Questions Form view  -->
 
-	<record model="ir.ui.view" id="view_question_form">
-		<field name="name">Questions</field>
-		<field name="model">crm_profiling.question</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-		  <form string="Questions">
-			<newline/>
-			<field name="name" select="1" />
-			<newline/>
-			<separator string="Avalaible answers" colspan="4"/>
-			<field name="answers_ids" colspan="4" nolabel="1" editable="bottom">
-			  <tree string="Answers" editable="bottom">
-				<field name="name" select="1"/>
-			  </tree>
-			  <form string="Answers">
-				<field name="name" select="1"/>
-			  </form>
-			</field>
-		  </form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_question_form">
+        <field name="name">Questions</field>
+        <field name="model">crm_profiling.question</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+          <form string="Questions">
+            <newline/>
+            <field name="name" select="1" />
+            <newline/>
+            <separator string="Avalaible answers" colspan="4"/>
+            <field name="answers_ids" colspan="4" nolabel="1" editable="bottom">
+              <tree string="Answers" editable="bottom">
+                <field name="name" select="1"/>
+              </tree>
+              <form string="Answers">
+                <field name="name" select="1"/>
+              </form>
+            </field>
+          </form>
+        </field>
+    </record>
 
 
-	<record model="ir.ui.view" id="view_partner_form">
-		<field name="name">res.partner.profile.form</field>
-		<field name="model">res.partner</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="base.view_partner_form"/>
-		<field name="arch" type="xml">
-			<notebook position="inside">
-				<page string="Profiling">
-				  <button string="Use a questionnaire"
-				  	name="%(wizard_open_questionnaire)d" type="action" colspan="1"
-				  	icon="gtk-justify-fill" />
-				  <newline/>
-				  <field name="answers_ids" colspan="4" nolabel="1"/>
-				</page>
-			</notebook>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_partner_form">
+        <field name="name">res.partner.profile.form</field>
+        <field name="model">res.partner</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <notebook position="inside">
+                <page string="Profiling">
+                  <button string="Use a questionnaire"
+                      name="%(wizard_open_questionnaire)d" type="action" colspan="1"
+                      icon="gtk-justify-fill" />
+                  <newline/>
+                  <field name="answers_ids" colspan="4" nolabel="1"/>
+                </page>
+            </notebook>
+        </field>
+    </record>
 
 <!-- CRM Segmentation Form view  -->
 
-	<record model="ir.ui.view" id="crm.crm_segmentation-view">
-		<field name="name">crm.segmentation.form</field>
-		<field name="model">crm.segmentation</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Partner Segmentation">
-				<notebook>
-				<page string="Segmentation">
-					<separator string="Segmentation Description" colspan="4"/>
-					<field name="name" select="1"/>
-					<field name="exclusif"/>
-					<newline/>
-					<field name="categ_id" select="2" colspan="2"/>
-					<newline/>
-					<field name="description" select="2" colspan="4"/>
-					<field name="state"/>
-					<group col="3" colspan="2">
-						<button name="process_start"
-							states="not running" string="Compute Segmentation" type="object"
-							icon="gtk-apply" />
-						<button name="process_stop" states="running"
-							string="Stop Process" type="object" icon="gtk-stop" />
-						<button name="process_continue" states="running"
-							string="Continue Process" type="object" icon="gtk-go-forward" />
-					</group>
-				</page>
-				<page string="Sales Purchase">
-					<field name="sales_purchase_active"/>
-					<separator string="State of Mind Computation" colspan="4"/>
-					<field name="som_interval"/>
-					<field name="som_interval_max"/>
-					<field name="som_interval_decrease"/>
-					<field name="som_interval_default"/>
-					<separator string="Segmentation Test" colspan="4"/>
-					<field name="segmentation_line" widget="one2many_list" colspan="4"/>
-				</page>
-				<page string="Profiling">
-					<field name="profiling_active" colspan="2"/>
-					<separator string="Profiling Options" colspan="4"/>
-					<field name="parent_id" colspan="2"/><newline/>
-					<separator string="Included Answers :" colspan="2" />
-					<separator string="Excluded Answers :" colspan="2"/>
-					<field name="answer_yes" nolabel="1" colspan="2"/>
-					<field name="answer_no" nolabel="1" colspan="2"/>
-				</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="crm.crm_segmentation-view">
+        <field name="name">crm.segmentation.form</field>
+        <field name="model">crm.segmentation</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Partner Segmentation">
+                <notebook>
+                <page string="Segmentation">
+                    <separator string="Segmentation Description" colspan="4"/>
+                    <field name="name" select="1"/>
+                    <field name="exclusif"/>
+                    <newline/>
+                    <field name="categ_id" colspan="2"/>
+                    <newline/>
+                    <field name="description" colspan="4"/>
+                    <field name="state"/>
+                    <group col="3" colspan="2">
+                        <button name="process_start"
+                            states="not running" string="Compute Segmentation" type="object"
+                            icon="gtk-apply" />
+                        <button name="process_stop" states="running"
+                            string="Stop Process" type="object" icon="gtk-stop" />
+                        <button name="process_continue" states="running"
+                            string="Continue Process" type="object" icon="gtk-go-forward" />
+                    </group>
+                </page>
+                <page string="Sales Purchase">
+                    <field name="sales_purchase_active"/>
+                    <separator string="State of Mind Computation" colspan="4"/>
+                    <field name="som_interval"/>
+                    <field name="som_interval_max"/>
+                    <field name="som_interval_decrease"/>
+                    <field name="som_interval_default"/>
+                    <separator string="Segmentation Test" colspan="4"/>
+                    <field name="segmentation_line" widget="one2many_list" colspan="4"/>
+                </page>
+                <page string="Profiling">
+                    <field name="profiling_active" colspan="2"/>
+                    <separator string="Profiling Options" colspan="4"/>
+                    <field name="parent_id" colspan="2"/><newline/>
+                    <separator string="Included Answers :" colspan="2" />
+                    <separator string="Excluded Answers :" colspan="2"/>
+                    <field name="answer_yes" nolabel="1" colspan="2"/>
+                    <field name="answer_no" nolabel="1" colspan="2"/>
+                </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
 
 <!-- CRM Segmentation Tree view  -->
 
-	<record model="ir.ui.view" id="view_partner_crm_segmentation_tree">
-		<field name="name">crm.segmentation.tree</field>
-		<field name="model">crm.segmentation</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Partner Segmentations">
-				<field name="name"/>
-				<field name="description"/>
-				<field name="categ_id"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_partner_crm_segmentation_tree">
+        <field name="name">crm.segmentation.tree</field>
+        <field name="model">crm.segmentation</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Partner Segmentations">
+                <field name="name"/>
+                <field name="description"/>
+                <field name="categ_id"/>
+            </tree>
+        </field>
+    </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/crm_profiling/i18n/ar.po b/addons/crm_profiling/i18n/ar.po
index ad0c98e9ce9..c9f00c15f6f 100644
--- a/addons/crm_profiling/i18n/ar.po
+++ b/addons/crm_profiling/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/bg.po b/addons/crm_profiling/i18n/bg.po
index 64a1a506cf6..a13f31bfb07 100644
--- a/addons/crm_profiling/i18n/bg.po
+++ b/addons/crm_profiling/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/bs.po b/addons/crm_profiling/i18n/bs.po
index 8e1913ed12b..f122f060052 100644
--- a/addons/crm_profiling/i18n/bs.po
+++ b/addons/crm_profiling/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/ca.po b/addons/crm_profiling/i18n/ca.po
index e3b51393cb6..8f357d59fc9 100644
--- a/addons/crm_profiling/i18n/ca.po
+++ b/addons/crm_profiling/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/cs.po b/addons/crm_profiling/i18n/cs.po
index ad0c98e9ce9..c9f00c15f6f 100644
--- a/addons/crm_profiling/i18n/cs.po
+++ b/addons/crm_profiling/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/de.po b/addons/crm_profiling/i18n/de.po
index e6eda33972f..f0b7074444f 100644
--- a/addons/crm_profiling/i18n/de.po
+++ b/addons/crm_profiling/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/el.po b/addons/crm_profiling/i18n/el.po
index e2d2748bdd0..89bdcd89224 100644
--- a/addons/crm_profiling/i18n/el.po
+++ b/addons/crm_profiling/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/crm_profiling/i18n/es.po b/addons/crm_profiling/i18n/es.po
index 06962cd6dd5..df53bc14f00 100644
--- a/addons/crm_profiling/i18n/es.po
+++ b/addons/crm_profiling/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/es_AR.po b/addons/crm_profiling/i18n/es_AR.po
index 413401841f1..823d3f305a6 100644
--- a/addons/crm_profiling/i18n/es_AR.po
+++ b/addons/crm_profiling/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/et.po b/addons/crm_profiling/i18n/et.po
index bc8d3650c14..766c2a09e07 100644
--- a/addons/crm_profiling/i18n/et.po
+++ b/addons/crm_profiling/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/fr.po b/addons/crm_profiling/i18n/fr.po
index 0e82531d2b9..d89c5d91625 100644
--- a/addons/crm_profiling/i18n/fr.po
+++ b/addons/crm_profiling/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/hr.po b/addons/crm_profiling/i18n/hr.po
index 9dc75a158f0..30d7f95d439 100644
--- a/addons/crm_profiling/i18n/hr.po
+++ b/addons/crm_profiling/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/crm_profiling/i18n/hu.po b/addons/crm_profiling/i18n/hu.po
index ad0c98e9ce9..c9f00c15f6f 100644
--- a/addons/crm_profiling/i18n/hu.po
+++ b/addons/crm_profiling/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/id.po b/addons/crm_profiling/i18n/id.po
index 72d0313ec33..d14f93199f9 100644
--- a/addons/crm_profiling/i18n/id.po
+++ b/addons/crm_profiling/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po
index ad2ca5fb998..40a262521d1 100644
--- a/addons/crm_profiling/i18n/it.po
+++ b/addons/crm_profiling/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/ko.po b/addons/crm_profiling/i18n/ko.po
index b3dd9d94ad9..1b59c77929b 100644
--- a/addons/crm_profiling/i18n/ko.po
+++ b/addons/crm_profiling/i18n/ko.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:32+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-04-15 00:44+0000\n"
+"Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
@@ -43,12 +43,12 @@ msgstr "자식 프로파일"
 #. module: crm_profiling
 #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
 msgid "crm_profiling management"
-msgstr ""
+msgstr "crm 프로파일링 관리자(_P)"
 
 #. module: crm_profiling
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "액션 정의에서 유효하지 않은 모델 이름"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
@@ -91,7 +91,7 @@ msgstr "질의서 이용"
 #. module: crm_profiling
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "유효하지 않은 아키텍처를 위한 XML 보기!"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/lt.po b/addons/crm_profiling/i18n/lt.po
index ab6738c82f8..45ed829c1f5 100644
--- a/addons/crm_profiling/i18n/lt.po
+++ b/addons/crm_profiling/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/lv.po b/addons/crm_profiling/i18n/lv.po
index 5d85a550139..d518efad61a 100644
--- a/addons/crm_profiling/i18n/lv.po
+++ b/addons/crm_profiling/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/nl.po b/addons/crm_profiling/i18n/nl.po
index ba3729b6a4a..93b9ebf2020 100644
--- a/addons/crm_profiling/i18n/nl.po
+++ b/addons/crm_profiling/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/nl_BE.po b/addons/crm_profiling/i18n/nl_BE.po
index 1e978f739b6..ba0d0039242 100644
--- a/addons/crm_profiling/i18n/nl_BE.po
+++ b/addons/crm_profiling/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/pl.po b/addons/crm_profiling/i18n/pl.po
index adf2bfd4ba5..5c30fe31019 100644
--- a/addons/crm_profiling/i18n/pl.po
+++ b/addons/crm_profiling/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po
index 3e84b833004..5c073f17dd1 100644
--- a/addons/crm_profiling/i18n/pt.po
+++ b/addons/crm_profiling/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/pt_BR.po b/addons/crm_profiling/i18n/pt_BR.po
index ea15fc7345b..4a1c221a806 100644
--- a/addons/crm_profiling/i18n/pt_BR.po
+++ b/addons/crm_profiling/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/ro.po b/addons/crm_profiling/i18n/ro.po
index 973e4278b92..f5494fa36e5 100644
--- a/addons/crm_profiling/i18n/ro.po
+++ b/addons/crm_profiling/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index f397bf58a68..16c4e3aeb79 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/sk.po b/addons/crm_profiling/i18n/sk.po
index 449d768201b..39d1a9e26d6 100644
--- a/addons/crm_profiling/i18n/sk.po
+++ b/addons/crm_profiling/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/sl.po b/addons/crm_profiling/i18n/sl.po
index 4751c82255e..24ab5c2a19a 100644
--- a/addons/crm_profiling/i18n/sl.po
+++ b/addons/crm_profiling/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/sv.po b/addons/crm_profiling/i18n/sv.po
index 390d723e6a1..ed34a92dab1 100644
--- a/addons/crm_profiling/i18n/sv.po
+++ b/addons/crm_profiling/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/tlh.po b/addons/crm_profiling/i18n/tlh.po
index 96d6cc61e94..3290328abbd 100644
--- a/addons/crm_profiling/i18n/tlh.po
+++ b/addons/crm_profiling/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index 89099d7c975..36b4a73134b 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/uk.po b/addons/crm_profiling/i18n/uk.po
index e9e3037198c..21a2566306e 100644
--- a/addons/crm_profiling/i18n/uk.po
+++ b/addons/crm_profiling/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/zh_CN.po b/addons/crm_profiling/i18n/zh_CN.po
index c91e1e2a57d..962cf87fa4b 100644
--- a/addons/crm_profiling/i18n/zh_CN.po
+++ b/addons/crm_profiling/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/zh_TW.po b/addons/crm_profiling/i18n/zh_TW.po
index c05efc2241f..e6b0a98798e 100644
--- a/addons/crm_profiling/i18n/zh_TW.po
+++ b/addons/crm_profiling/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_vertical/i18n/ar.po b/addons/crm_vertical/i18n/ar.po
index 4f97f82eb59..06a69d9c430 100644
--- a/addons/crm_vertical/i18n/ar.po
+++ b/addons/crm_vertical/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/bg.po b/addons/crm_vertical/i18n/bg.po
index b8c8c425f52..8988003b289 100644
--- a/addons/crm_vertical/i18n/bg.po
+++ b/addons/crm_vertical/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/bs.po b/addons/crm_vertical/i18n/bs.po
index 93893f0d03b..a3ed7802ae2 100644
--- a/addons/crm_vertical/i18n/bs.po
+++ b/addons/crm_vertical/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/ca.po b/addons/crm_vertical/i18n/ca.po
index 265012ba680..1bd33bc6c85 100644
--- a/addons/crm_vertical/i18n/ca.po
+++ b/addons/crm_vertical/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/cs.po b/addons/crm_vertical/i18n/cs.po
index 93893f0d03b..a3ed7802ae2 100644
--- a/addons/crm_vertical/i18n/cs.po
+++ b/addons/crm_vertical/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/da.po b/addons/crm_vertical/i18n/da.po
index 78130f5d120..cc7e06b556b 100644
--- a/addons/crm_vertical/i18n/da.po
+++ b/addons/crm_vertical/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/de.po b/addons/crm_vertical/i18n/de.po
index b253d16ce98..06eef6957ce 100644
--- a/addons/crm_vertical/i18n/de.po
+++ b/addons/crm_vertical/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/el.po b/addons/crm_vertical/i18n/el.po
index 9621d412a66..0463a8d6a06 100644
--- a/addons/crm_vertical/i18n/el.po
+++ b/addons/crm_vertical/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/crm_vertical/i18n/es.po b/addons/crm_vertical/i18n/es.po
index 4a15caaa659..d4a091725a8 100644
--- a/addons/crm_vertical/i18n/es.po
+++ b/addons/crm_vertical/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/es_AR.po b/addons/crm_vertical/i18n/es_AR.po
index 2cbd7a8d878..d2aa3b6437b 100644
--- a/addons/crm_vertical/i18n/es_AR.po
+++ b/addons/crm_vertical/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/et.po b/addons/crm_vertical/i18n/et.po
index e347a472d05..6cb97a11a69 100644
--- a/addons/crm_vertical/i18n/et.po
+++ b/addons/crm_vertical/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/fi.po b/addons/crm_vertical/i18n/fi.po
index 7c6584491f7..cfb91a4ccb4 100644
--- a/addons/crm_vertical/i18n/fi.po
+++ b/addons/crm_vertical/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/fr.po b/addons/crm_vertical/i18n/fr.po
index d1622be9f76..1f56459a334 100644
--- a/addons/crm_vertical/i18n/fr.po
+++ b/addons/crm_vertical/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/gl.po b/addons/crm_vertical/i18n/gl.po
index 23c2323229b..418ff647d3e 100644
--- a/addons/crm_vertical/i18n/gl.po
+++ b/addons/crm_vertical/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/hr.po b/addons/crm_vertical/i18n/hr.po
index 98a07d26ec7..3f48548e492 100644
--- a/addons/crm_vertical/i18n/hr.po
+++ b/addons/crm_vertical/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/crm_vertical/i18n/hu.po b/addons/crm_vertical/i18n/hu.po
index 93893f0d03b..a3ed7802ae2 100644
--- a/addons/crm_vertical/i18n/hu.po
+++ b/addons/crm_vertical/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/id.po b/addons/crm_vertical/i18n/id.po
index 4484120c6cf..78fa6ce730c 100644
--- a/addons/crm_vertical/i18n/id.po
+++ b/addons/crm_vertical/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/it.po b/addons/crm_vertical/i18n/it.po
index 27c33916881..56eaffbb04f 100644
--- a/addons/crm_vertical/i18n/it.po
+++ b/addons/crm_vertical/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/ko.po b/addons/crm_vertical/i18n/ko.po
index 551bb7f512c..6c0d0f88e4a 100644
--- a/addons/crm_vertical/i18n/ko.po
+++ b/addons/crm_vertical/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/lt.po b/addons/crm_vertical/i18n/lt.po
index 89cc7d2735d..72c85f0debf 100644
--- a/addons/crm_vertical/i18n/lt.po
+++ b/addons/crm_vertical/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/lv.po b/addons/crm_vertical/i18n/lv.po
index 65efc212a72..ea1fc3d5f10 100644
--- a/addons/crm_vertical/i18n/lv.po
+++ b/addons/crm_vertical/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/nl.po b/addons/crm_vertical/i18n/nl.po
index 4cf1d2a819f..1c83019554a 100644
--- a/addons/crm_vertical/i18n/nl.po
+++ b/addons/crm_vertical/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/nl_BE.po b/addons/crm_vertical/i18n/nl_BE.po
index ab62d84ba0b..726f9de3a1c 100644
--- a/addons/crm_vertical/i18n/nl_BE.po
+++ b/addons/crm_vertical/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/oc.po b/addons/crm_vertical/i18n/oc.po
index bc1f34b9063..70acbc68cf1 100644
--- a/addons/crm_vertical/i18n/oc.po
+++ b/addons/crm_vertical/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/pl.po b/addons/crm_vertical/i18n/pl.po
index 3b9fce913c3..327e0809314 100644
--- a/addons/crm_vertical/i18n/pl.po
+++ b/addons/crm_vertical/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/pt.po b/addons/crm_vertical/i18n/pt.po
index 7018d30bed7..46b9e064f9e 100644
--- a/addons/crm_vertical/i18n/pt.po
+++ b/addons/crm_vertical/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/pt_BR.po b/addons/crm_vertical/i18n/pt_BR.po
index 7e33a076127..b554ddd0479 100644
--- a/addons/crm_vertical/i18n/pt_BR.po
+++ b/addons/crm_vertical/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/ro.po b/addons/crm_vertical/i18n/ro.po
index 451eba84528..46df8527021 100644
--- a/addons/crm_vertical/i18n/ro.po
+++ b/addons/crm_vertical/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/ru.po b/addons/crm_vertical/i18n/ru.po
index 57be65e228f..9dc0e3fe5f1 100644
--- a/addons/crm_vertical/i18n/ru.po
+++ b/addons/crm_vertical/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/sk.po b/addons/crm_vertical/i18n/sk.po
index 0e5b1a49197..78fbb97ea26 100644
--- a/addons/crm_vertical/i18n/sk.po
+++ b/addons/crm_vertical/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/sl.po b/addons/crm_vertical/i18n/sl.po
index 3e99f0bc3b7..89d87a3457e 100644
--- a/addons/crm_vertical/i18n/sl.po
+++ b/addons/crm_vertical/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/sv.po b/addons/crm_vertical/i18n/sv.po
index 93893f0d03b..a3ed7802ae2 100644
--- a/addons/crm_vertical/i18n/sv.po
+++ b/addons/crm_vertical/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/tr.po b/addons/crm_vertical/i18n/tr.po
index 5f0662559c2..b16061da00f 100644
--- a/addons/crm_vertical/i18n/tr.po
+++ b/addons/crm_vertical/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/uk.po b/addons/crm_vertical/i18n/uk.po
index 3243828b34e..0c47815a1e8 100644
--- a/addons/crm_vertical/i18n/uk.po
+++ b/addons/crm_vertical/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/zh_CN.po b/addons/crm_vertical/i18n/zh_CN.po
index bb6497dfe9b..a1075425297 100644
--- a/addons/crm_vertical/i18n/zh_CN.po
+++ b/addons/crm_vertical/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/crm_vertical/i18n/zh_TW.po b/addons/crm_vertical/i18n/zh_TW.po
index 93893f0d03b..a3ed7802ae2 100644
--- a/addons/crm_vertical/i18n/zh_TW.po
+++ b/addons/crm_vertical/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
diff --git a/addons/decimal_precision/__terp__.py b/addons/decimal_precision/__openerp__.py
similarity index 100%
rename from addons/decimal_precision/__terp__.py
rename to addons/decimal_precision/__openerp__.py
diff --git a/addons/delivery/__terp__.py b/addons/delivery/__openerp__.py
similarity index 100%
rename from addons/delivery/__terp__.py
rename to addons/delivery/__openerp__.py
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 8b91d3cf198..16f4a61ed1e 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -124,10 +124,10 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <separator string="Notes" position="before">
+                <group name="logistic" position="inside">
                     <field name="id" invisible="True"/>
                     <field name="carrier_id" context="{'order_id':id}"/>
-                </separator>
+                </group>
             </field>
         </record>
 
@@ -143,7 +143,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_picking_withweight_in_form" model="ir.ui.view">
             <field name="name">stock.picking_withweight.in.form.view</field>
             <field name="type">form</field>
@@ -166,7 +166,7 @@
                     <field name="weight"/>
                 </field>
             </field>
-        </record>        
+        </record>
 
         <record id="view_picking_withcarrier_delivery_form" model="ir.ui.view">
             <field name="name">delivery.stock.picking_withcarrier.delivery.form.view</field>
@@ -192,7 +192,7 @@
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="search_view_id" ref="stock.view_picking_out_search"/>
         </record>
-        
+
         <record id="view_picking_withcarrier_out_move_form" model="ir.ui.view">
             <field name="name">delivery.stock.picking_withcarrier.out.move.form.view</field>
             <field name="type">form</field>
@@ -204,7 +204,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <record id="view_picking_withweight_in_move_form" model="ir.ui.view">
             <field name="name">stock.picking_withweight.in.move.form.view</field>
             <field name="type">form</field>
@@ -227,7 +227,7 @@
                     <field name="weight"/>
                 </xpath>
             </field>
-        </record>        
+        </record>
 
         <record id="view_picking_withcarrier_delivery_move_form" model="ir.ui.view">
             <field name="name">delivery.stock.picking_withcarrier.delivery.move.form.view</field>
@@ -240,7 +240,7 @@
                 </xpath>
             </field>
         </record>
-        
+
         <record id="view_move_withweight_tree" model="ir.ui.view">
             <field name="name">stock.move.tree.weight</field>
             <field name="type">tree</field>
@@ -252,7 +252,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_move_withweight_form" model="ir.ui.view">
             <field name="name">stock.move.form.weight</field>
             <field name="type">form</field>
@@ -264,7 +264,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_move_reception_picking_withweight_tree" model="ir.ui.view">
             <field name="name">stock.move.reception.packing.tree.weight</field>
             <field name="type">tree</field>
@@ -276,7 +276,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_move_reception_picking_withweight_form" model="ir.ui.view">
             <field name="name">stock.move.reception.packing.form.weight</field>
             <field name="type">form</field>
@@ -288,6 +288,6 @@
                 </field>
             </field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/delivery/i18n/ar.po b/addons/delivery/i18n/ar.po
index 22b63f6d145..f0471573757 100644
--- a/addons/delivery/i18n/ar.po
+++ b/addons/delivery/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/bg.po b/addons/delivery/i18n/bg.po
index 01cfb6734d2..331725994ed 100644
--- a/addons/delivery/i18n/bg.po
+++ b/addons/delivery/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/bs.po b/addons/delivery/i18n/bs.po
index f70560d53c0..343a4afc831 100644
--- a/addons/delivery/i18n/bs.po
+++ b/addons/delivery/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ca.po b/addons/delivery/i18n/ca.po
index e364c73b00f..2766e85c276 100644
--- a/addons/delivery/i18n/ca.po
+++ b/addons/delivery/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po
index 7520ea45767..10d056a7c62 100644
--- a/addons/delivery/i18n/cs.po
+++ b/addons/delivery/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index 31c6b5b52a7..fae903a64a4 100644
--- a/addons/delivery/i18n/de.po
+++ b/addons/delivery/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/el.po b/addons/delivery/i18n/el.po
index 38cef00146f..5f78311d6b8 100644
--- a/addons/delivery/i18n/el.po
+++ b/addons/delivery/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index eeeeb2f8ee3..6d0416c5e93 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/es_AR.po b/addons/delivery/i18n/es_AR.po
index 154ed889f4f..878e99763e9 100644
--- a/addons/delivery/i18n/es_AR.po
+++ b/addons/delivery/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/et.po b/addons/delivery/i18n/et.po
index 1cc4fd8ec32..852538b244f 100644
--- a/addons/delivery/i18n/et.po
+++ b/addons/delivery/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/fi.po b/addons/delivery/i18n/fi.po
index 8ae0037f2fe..361e7fe9c62 100644
--- a/addons/delivery/i18n/fi.po
+++ b/addons/delivery/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index daaf0a7c393..8ee121c717c 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index abb7f23a7ef..03d0aaea497 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/delivery/i18n/hu.po b/addons/delivery/i18n/hu.po
index 95a58f140cd..8cd8f1f27e1 100644
--- a/addons/delivery/i18n/hu.po
+++ b/addons/delivery/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/id.po b/addons/delivery/i18n/id.po
index 676a4b0e97f..16fa3900be1 100644
--- a/addons/delivery/i18n/id.po
+++ b/addons/delivery/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index 5922cb867a0..29c3bc9ec80 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ko.po b/addons/delivery/i18n/ko.po
index 4abf0961f45..5528522c512 100644
--- a/addons/delivery/i18n/ko.po
+++ b/addons/delivery/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/lt.po b/addons/delivery/i18n/lt.po
index 3358cbf1371..03bf3761d5e 100644
--- a/addons/delivery/i18n/lt.po
+++ b/addons/delivery/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index 6ec3cbb3888..8228774e5a6 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/nl_BE.po b/addons/delivery/i18n/nl_BE.po
index 6415f03046a..903d36bb4d0 100644
--- a/addons/delivery/i18n/nl_BE.po
+++ b/addons/delivery/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index fc076c2d0f7..abbc1ce1987 100644
--- a/addons/delivery/i18n/pl.po
+++ b/addons/delivery/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/pt.po b/addons/delivery/i18n/pt.po
index 51b7091b4ec..ca431066c89 100644
--- a/addons/delivery/i18n/pt.po
+++ b/addons/delivery/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index bddbb2d93b7..deedbf0f1e2 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ro.po b/addons/delivery/i18n/ro.po
index 31df5787ac4..6a1894a0103 100644
--- a/addons/delivery/i18n/ro.po
+++ b/addons/delivery/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index cd057e5d735..c59e964b00a 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index 12e6e5b979c..fd99168a37f 100644
--- a/addons/delivery/i18n/sl.po
+++ b/addons/delivery/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index 89b416a9c49..e05c5504d3a 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/tlh.po b/addons/delivery/i18n/tlh.po
index 3edacec1c81..4f6d008b06c 100644
--- a/addons/delivery/i18n/tlh.po
+++ b/addons/delivery/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+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 ed93c4028b0..877c10ffc6a 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/uk.po b/addons/delivery/i18n/uk.po
index e382f4264da..c10a72f89be 100644
--- a/addons/delivery/i18n/uk.po
+++ b/addons/delivery/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 357619ff101..98da075c532 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/zh_TW.po b/addons/delivery/i18n/zh_TW.po
index b0ab99a47fc..64893a89777 100644
--- a/addons/delivery/i18n/zh_TW.po
+++ b/addons/delivery/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/document/__terp__.py b/addons/document/__openerp__.py
similarity index 100%
rename from addons/document/__terp__.py
rename to addons/document/__openerp__.py
diff --git a/addons/document/custom_view.xml b/addons/document/custom_view.xml
index 61d95f9aa27..894e5bac77f 100644
--- a/addons/document/custom_view.xml
+++ b/addons/document/custom_view.xml
@@ -1,12 +1,12 @@
 <openerp>
 <data>
-	<record model="res.groups" id="group_compta_user">
- 		<field name="name">grcompta</field>
-	</record>
-	<record model="res.groups" id="group_compta_admin">
-		<field name="name">grcomptaadmin</field>
-	</record>
-	<menuitem name="Administration" groups="admin,grcomptaadmin" icon="terp-stock" id="menu_admin_compta"/>
+    <record model="res.groups" id="group_compta_user">
+        <field name="name">grcompta</field>
+    </record>
+    <record model="res.groups" id="group_compta_admin">
+        <field name="name">grcomptaadmin</field>
+    </record>
+    <menuitem name="Administration" groups="admin,grcomptaadmin" icon="terp-stock" id="menu_admin_compta"/>
 </data>
 </openerp>
 
diff --git a/addons/document/document.py b/addons/document/document.py
index f6cbddebae7..2b2ac2f7587 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -73,7 +73,7 @@ class document_file(osv.osv):
 
     _columns = {
         'user_id': fields.many2one('res.users', 'Owner', select=1),
-        'group_ids': fields.many2many('res.groups', 'document_directory_group_rel', 'item_id', 'group_id', 'Groups'),
+        'group_ids': fields.many2many('res.groups', 'document_group_rel', 'item_id', 'group_id', 'Groups'),
         # the directory id now is mandatory. It can still be computed automatically.
         'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True),
         'file_size': fields.integer('File Size', required=True),
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 270f2d9353f..c9c124cdfe0 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -52,7 +52,7 @@ class document_directory(osv.osv):
         'ressource_type_id': fields.many2one('ir.model', 'Directories Mapped to Objects',
             help="Select an object here and Open ERP will create a mapping for each of these " \
                  "objects, using the given domain, when browsing through FTP."),
-        'resource_field': fields.char('Name field',size=32,help='Field to be used as name on resource directories. If empty, the "name" will be used.'),
+        'resource_field': fields.many2one('ir.model.fields', 'Name field', help='Field to be used as name on resource directories. If empty, the "name" will be used.'),
         'ressource_parent_type_id': fields.many2one('ir.model', 'Parent Model',
             help="If you put an object here, this directory template will appear bellow all of these objects. " \
                  "Don't put a parent directory if you select a parent model."),
@@ -61,10 +61,12 @@ class document_directory(osv.osv):
             help="Check this if you want to use the same tree structure as the object selected in the system."),
         'dctx_ids': fields.one2many('document.directory.dctx', 'dir_id', 'Context fields'),
     }
+
+
     def _get_root_directory(self, cr,uid, context=None):
         objid=self.pool.get('ir.model.data')
         try:
-            mid = objid._get_id(cr, uid, 'document', 'dir_root')            
+            mid = objid._get_id(cr, uid, 'document', 'dir_root')
             if not mid:
                 return False
             root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index bea11d6d12e..421c423b900 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -103,7 +103,7 @@ class document_storage(osv.osv):
         'create_date': fields.datetime('Date Created', readonly=True),
         'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
         'user_id': fields.many2one('res.users', 'Owner'),
-        'group_ids': fields.many2many('res.groups', 'document_directory_group_rel', 'item_id', 'group_id', 'Groups'),
+        'group_ids': fields.many2many('res.groups', 'document_storage_group_rel', 'item_id', 'group_id', 'Groups'),
         'dir_ids': fields.one2many('document.directory', 'parent_id', 'Directories'),
         'type': fields.selection([('db', 'Database'), ('filestore', 'Internal File storage'),
             ('realstore', 'External file storage'), ('virtual', 'Virtual storage')], 'Type', required=True),
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index cdbdf161891..0185f9fe444 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -13,12 +13,16 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Storage Media">
-                <field name="name" select="1" colspan="4"/>
-                <field name="user_id"/>
-                <field name="type" />
-                <field name="online" />
-                <field name="readonly" />
-                <field name="path" />
+            	<group colspan="4" col="4">
+	                <field name="name" select="1" colspan="4"/>
+	                <field name="user_id"/>
+	                <field name="type"/>
+	                <field name="online"/>
+	                <field name="readonly"/>
+                </group>
+                <group colspan="2" attrs="{'invisible':[('type','!=','realstore')]}">
+                	<field name="path"/>
+                </group>
             </form>
         </field>
     </record>
@@ -67,13 +71,13 @@
                     <newline/>
                     <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
                     <field name="ressource_tree"/>
-                    <field name="resource_field"/>
+					<field name="resource_field" 	domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
                     <field name="ressource_id" select="2" readonly="1"/>
                     <field name="ressource_parent_type_id"/>
                 </page>
                 <page string="Generated Files">
                     <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
-                    <field name="content_ids" nolabel="1" colspan="4">
+					<field name="content_ids" nolabel="1" colspan="4" attrs="{'readonly': [('ressource_type_id','=',False)]}">
                         <form string="Contents">
                             <field name="name"/>
                             <field name="sequence"/>
@@ -179,7 +183,7 @@
                     <field name="title" select="1"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
-                    <field name="parent_id" select="2"/>                    
+                    <field name="parent_id"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Attachment">
@@ -190,7 +194,7 @@
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Attached To" colspan="2"/>
-                        <field name="res_model" select="2" readonly="1"/>
+                        <field name="res_model" readonly="1"/>
                         <field name="res_id" readonly="1"/>
                     </group>
                     <separator string="Preview" colspan="4"/>
@@ -207,18 +211,18 @@
                     <field name="index_content" nolabel="1" colspan="4" select="1"/>
                 </page><page string="Security">
                     <field name="group_ids" colspan="4" nolabel="1"/>
-                </page><page string="Others Info">                                        
-                    <group colspan="4" col="4">   
-                        <separator string="File Information" colspan="4"/>                     
-                        <field name="file_size" readonly="1"/>                      
+                </page><page string="Others Info">
+                    <group colspan="4" col="4">
+                        <separator string="File Information" colspan="4"/>
+                        <field name="file_size" readonly="1"/>
                         <newline/>
-                        <separator string="History" colspan="4"/>                     
+                        <separator string="History" colspan="4"/>
                         <field name="create_uid"/>
                         <field name="create_date"/>
                         <field name="write_uid"/>
-                        <field name="write_date"/>                        
-                    </group>                   
-                    
+                        <field name="write_date"/>
+                    </group>
+
                 </page><page string="Notes">
                     <field colspan="4" name="description" nolabel="1"/>
                 </page>
diff --git a/addons/document/i18n/ar.po b/addons/document/i18n/ar.po
index e18ea0ac012..91ce0c71047 100644
--- a/addons/document/i18n/ar.po
+++ b/addons/document/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/bg.po b/addons/document/i18n/bg.po
index d1f32251285..72282fecb42 100644
--- a/addons/document/i18n/bg.po
+++ b/addons/document/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/bs.po b/addons/document/i18n/bs.po
index 0fcba55b202..86366cda5db 100644
--- a/addons/document/i18n/bs.po
+++ b/addons/document/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ca.po b/addons/document/i18n/ca.po
index f7d0d729eab..bfb8582635d 100644
--- a/addons/document/i18n/ca.po
+++ b/addons/document/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/cs.po b/addons/document/i18n/cs.po
index 35d282536c0..062bfaa4115 100644
--- a/addons/document/i18n/cs.po
+++ b/addons/document/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index 888d0cfa283..afa752bff8f 100644
--- a/addons/document/i18n/de.po
+++ b/addons/document/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/el.po b/addons/document/i18n/el.po
index a065284449a..6483bc62718 100644
--- a/addons/document/i18n/el.po
+++ b/addons/document/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po
index 3ddd79861a0..a39e0a74712 100644
--- a/addons/document/i18n/es.po
+++ b/addons/document/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/es_AR.po b/addons/document/i18n/es_AR.po
index af68daa155a..772f40a986b 100644
--- a/addons/document/i18n/es_AR.po
+++ b/addons/document/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/et.po b/addons/document/i18n/et.po
index 5569d6f82c3..44f838e3493 100644
--- a/addons/document/i18n/et.po
+++ b/addons/document/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/fi.po b/addons/document/i18n/fi.po
index 29c1b7c1bf1..82b4e4a50c6 100644
--- a/addons/document/i18n/fi.po
+++ b/addons/document/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po
index 687c3dbf7cd..a9d451e6ce5 100644
--- a/addons/document/i18n/fr.po
+++ b/addons/document/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/hi.po b/addons/document/i18n/hi.po
index 65a573b017c..aed899e7603 100644
--- a/addons/document/i18n/hi.po
+++ b/addons/document/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/hr.po b/addons/document/i18n/hr.po
index 9a915c88ba7..cffd1efde18 100644
--- a/addons/document/i18n/hr.po
+++ b/addons/document/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/document/i18n/hu.po b/addons/document/i18n/hu.po
index d69cf4cac21..f412de949ea 100644
--- a/addons/document/i18n/hu.po
+++ b/addons/document/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/id.po b/addons/document/i18n/id.po
index 1a6f1f1ae2b..2b965bd3ca9 100644
--- a/addons/document/i18n/id.po
+++ b/addons/document/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index d56849427d3..c8652890e22 100644
--- a/addons/document/i18n/it.po
+++ b/addons/document/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ko.po b/addons/document/i18n/ko.po
index 66e67c3e5fa..e17f3986cc7 100644
--- a/addons/document/i18n/ko.po
+++ b/addons/document/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/lt.po b/addons/document/i18n/lt.po
index b17daa1ce6a..b1e4fa13f56 100644
--- a/addons/document/i18n/lt.po
+++ b/addons/document/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index 5746b23a109..4a0bb454f34 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/nl_BE.po b/addons/document/i18n/nl_BE.po
index 2ea40847ffc..8b4d88471e3 100644
--- a/addons/document/i18n/nl_BE.po
+++ b/addons/document/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/pl.po b/addons/document/i18n/pl.po
index 833699c5262..ea1548833f7 100644
--- a/addons/document/i18n/pl.po
+++ b/addons/document/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/pt.po b/addons/document/i18n/pt.po
index f2249444413..bbb39083a64 100644
--- a/addons/document/i18n/pt.po
+++ b/addons/document/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po
index ca473836999..752f6e5f8b1 100644
--- a/addons/document/i18n/pt_BR.po
+++ b/addons/document/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ro.po b/addons/document/i18n/ro.po
index aaebb4f052b..1bdc1740b6b 100644
--- a/addons/document/i18n/ro.po
+++ b/addons/document/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+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 14d92c430a7..8ce64f68ed8 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-04 06:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-13 05:32+0000\n"
+"Last-Translator: grisha <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-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
 #: field:document.directory,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: document
 #: field:document.directory,ressource_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "ID объекта"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -47,7 +47,7 @@ msgstr ""
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Ошибка! Вы не можете созадавать вложенные друг в друга директории."
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_configuration
@@ -57,7 +57,7 @@ msgstr ""
 #. module: document
 #: view:ir.attachment:0
 msgid "Preview"
-msgstr ""
+msgstr "Предпросмотр"
 
 #. module: document
 #: field:ir.attachment,store_method:0
@@ -72,7 +72,7 @@ msgstr ""
 #. module: document
 #: field:ir.attachment,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Размер файла"
 
 #. module: document
 #: help:document.directory.content,include_name:0
diff --git a/addons/document/i18n/sl.po b/addons/document/i18n/sl.po
index 84c36f6c24a..6d15fbd387d 100644
--- a/addons/document/i18n/sl.po
+++ b/addons/document/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po
index 8550c818416..068b58b7a73 100644
--- a/addons/document/i18n/sv.po
+++ b/addons/document/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/tlh.po b/addons/document/i18n/tlh.po
index 056a6bc0443..1155dc089b8 100644
--- a/addons/document/i18n/tlh.po
+++ b/addons/document/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+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 28a6eb97233..a0bac3bd4bb 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/uk.po b/addons/document/i18n/uk.po
index fc88f9c554d..881243d52b3 100644
--- a/addons/document/i18n/uk.po
+++ b/addons/document/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+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 2a5814aacb6..fe8869eb6a7 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po
index 57d3f0ae14c..847a1a75a91 100644
--- a/addons/document/i18n/zh_TW.po
+++ b/addons/document/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index c7eb80c0a45..f0342fcb885 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -320,7 +320,7 @@ class node_res_dir(node_class):
         self.content_length = 0
         self.res_model = dirr.ressource_type_id and dirr.ressource_type_id.model or False
         self.resm_id = dirr.ressource_id
-        self.namefield = dirr.resource_field or 'name'
+        self.namefield = dirr.resource_field.name or 'name'
         self.displayname = dirr.name
         # Important: the domain is evaluated using the *parent* dctx!        
         self.domain = dirr.domain
@@ -508,7 +508,7 @@ class node_res_obj(node_class):
                 where1 = where + [(obj._parent_name, '=', self.res_id)]
             resids = obj.search(cr,uid, where1, context=ctx)                        
             for bo in obj.browse(cr,uid,resids,context=ctx):
-                namefield = directory.resource_field or 'name'
+                namefield = directory.resource_field.name or 'name'
                 if not bo:
                     continue
                 res_name = getattr(bo, namefield)
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index d44694361b6..4979c05a17d 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -23,7 +23,6 @@ import StringIO
 import odt2txt
 from subprocess import Popen, PIPE
 from content_index import indexer, cntIndex
-from subprocess import Popen, PIPE
 
 def _to_unicode(s):
     try:
diff --git a/addons/document_ftp/__terp__.py b/addons/document_ftp/__openerp__.py
similarity index 100%
rename from addons/document_ftp/__terp__.py
rename to addons/document_ftp/__openerp__.py
diff --git a/addons/document_ics/__terp__.py b/addons/document_ics/__openerp__.py
similarity index 100%
rename from addons/document_ics/__terp__.py
rename to addons/document_ics/__openerp__.py
diff --git a/addons/document_ics/i18n/ar.po b/addons/document_ics/i18n/ar.po
index abd7f08fbc0..de16196762d 100644
--- a/addons/document_ics/i18n/ar.po
+++ b/addons/document_ics/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/bg.po b/addons/document_ics/i18n/bg.po
index e62a0fdf1e3..d28d0991397 100644
--- a/addons/document_ics/i18n/bg.po
+++ b/addons/document_ics/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/bs.po b/addons/document_ics/i18n/bs.po
index 0ff45cd37f2..925b6c1e128 100644
--- a/addons/document_ics/i18n/bs.po
+++ b/addons/document_ics/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/ca.po b/addons/document_ics/i18n/ca.po
index 2bf0f2664d2..db59f22afd0 100644
--- a/addons/document_ics/i18n/ca.po
+++ b/addons/document_ics/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/cs.po b/addons/document_ics/i18n/cs.po
index db9e1a13a55..09581b3c2ed 100644
--- a/addons/document_ics/i18n/cs.po
+++ b/addons/document_ics/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/de.po b/addons/document_ics/i18n/de.po
index 4b795252e28..07085d36292 100644
--- a/addons/document_ics/i18n/de.po
+++ b/addons/document_ics/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/el.po b/addons/document_ics/i18n/el.po
index 410bd925ab0..b58112fc39c 100644
--- a/addons/document_ics/i18n/el.po
+++ b/addons/document_ics/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/document_ics/i18n/es.po b/addons/document_ics/i18n/es.po
index acd84b62b46..d8924a3cd4c 100644
--- a/addons/document_ics/i18n/es.po
+++ b/addons/document_ics/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/es_AR.po b/addons/document_ics/i18n/es_AR.po
index cee46107ecd..595fff8e966 100644
--- a/addons/document_ics/i18n/es_AR.po
+++ b/addons/document_ics/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/et.po b/addons/document_ics/i18n/et.po
index 341f0b47721..79dbad26d26 100644
--- a/addons/document_ics/i18n/et.po
+++ b/addons/document_ics/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/fi.po b/addons/document_ics/i18n/fi.po
index c4bc982f602..18150ac249d 100644
--- a/addons/document_ics/i18n/fi.po
+++ b/addons/document_ics/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/fr.po b/addons/document_ics/i18n/fr.po
index ffc56b151c1..829e71f8bb1 100644
--- a/addons/document_ics/i18n/fr.po
+++ b/addons/document_ics/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/hr.po b/addons/document_ics/i18n/hr.po
index 5342f2419a7..fa6af36859a 100644
--- a/addons/document_ics/i18n/hr.po
+++ b/addons/document_ics/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/hu.po b/addons/document_ics/i18n/hu.po
index abd7f08fbc0..de16196762d 100644
--- a/addons/document_ics/i18n/hu.po
+++ b/addons/document_ics/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/id.po b/addons/document_ics/i18n/id.po
index 4b3c545244e..613875f9819 100644
--- a/addons/document_ics/i18n/id.po
+++ b/addons/document_ics/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/it.po b/addons/document_ics/i18n/it.po
index 4d7b9c159da..1f6b4c4f161 100644
--- a/addons/document_ics/i18n/it.po
+++ b/addons/document_ics/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/ko.po b/addons/document_ics/i18n/ko.po
index fb882000955..2cec6e000a2 100644
--- a/addons/document_ics/i18n/ko.po
+++ b/addons/document_ics/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/lt.po b/addons/document_ics/i18n/lt.po
index 1f4b6dfd2ae..1c4b4a120b4 100644
--- a/addons/document_ics/i18n/lt.po
+++ b/addons/document_ics/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/nl.po b/addons/document_ics/i18n/nl.po
index 652beebb1cd..d9055f71290 100644
--- a/addons/document_ics/i18n/nl.po
+++ b/addons/document_ics/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/nl_BE.po b/addons/document_ics/i18n/nl_BE.po
index deab9207100..e4fb4239a22 100644
--- a/addons/document_ics/i18n/nl_BE.po
+++ b/addons/document_ics/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/pl.po b/addons/document_ics/i18n/pl.po
index 87dcbd694eb..318dbc35922 100644
--- a/addons/document_ics/i18n/pl.po
+++ b/addons/document_ics/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/pt.po b/addons/document_ics/i18n/pt.po
index d62f4b22ffe..0b008a15146 100644
--- a/addons/document_ics/i18n/pt.po
+++ b/addons/document_ics/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/pt_BR.po b/addons/document_ics/i18n/pt_BR.po
index 47cbb484427..985607f63a2 100644
--- a/addons/document_ics/i18n/pt_BR.po
+++ b/addons/document_ics/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/ro.po b/addons/document_ics/i18n/ro.po
index 58e5bd95f7d..f12bd451aa6 100644
--- a/addons/document_ics/i18n/ro.po
+++ b/addons/document_ics/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/ru.po b/addons/document_ics/i18n/ru.po
index f6f26a399ae..33680ffcd74 100644
--- a/addons/document_ics/i18n/ru.po
+++ b/addons/document_ics/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/sl.po b/addons/document_ics/i18n/sl.po
index cab3fe497e0..69997f8cb67 100644
--- a/addons/document_ics/i18n/sl.po
+++ b/addons/document_ics/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/sv.po b/addons/document_ics/i18n/sv.po
index e72d431d65e..796e223577d 100644
--- a/addons/document_ics/i18n/sv.po
+++ b/addons/document_ics/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/tlh.po b/addons/document_ics/i18n/tlh.po
index b428e6e03f6..1f8b66b579b 100644
--- a/addons/document_ics/i18n/tlh.po
+++ b/addons/document_ics/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index 8d261d19f9c..8b38392d3aa 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/uk.po b/addons/document_ics/i18n/uk.po
index b3a8d4464cc..7e13251116e 100644
--- a/addons/document_ics/i18n/uk.po
+++ b/addons/document_ics/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+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 3b4c8478ba1..9a29e2f9df5 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/zh_TW.po b/addons/document_ics/i18n/zh_TW.po
index 50dc0305294..dbc7c62faed 100644
--- a/addons/document_ics/i18n/zh_TW.po
+++ b/addons/document_ics/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_webdav/__terp__.py b/addons/document_webdav/__openerp__.py
similarity index 100%
rename from addons/document_webdav/__terp__.py
rename to addons/document_webdav/__openerp__.py
diff --git a/addons/document_webdav/i18n/bg.po b/addons/document_webdav/i18n/bg.po
index 1a13fa82450..81775a48ff9 100644
--- a/addons/document_webdav/i18n/bg.po
+++ b/addons/document_webdav/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/cs.po b/addons/document_webdav/i18n/cs.po
index 13fafd57c49..60dccd2e317 100644
--- a/addons/document_webdav/i18n/cs.po
+++ b/addons/document_webdav/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/de.po b/addons/document_webdav/i18n/de.po
index fd265104057..875b6e59b5b 100644
--- a/addons/document_webdav/i18n/de.po
+++ b/addons/document_webdav/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/es.po b/addons/document_webdav/i18n/es.po
index d480732519a..568c77f9349 100644
--- a/addons/document_webdav/i18n/es.po
+++ b/addons/document_webdav/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/hr.po b/addons/document_webdav/i18n/hr.po
index 72927b920b1..b38ab446b08 100644
--- a/addons/document_webdav/i18n/hr.po
+++ b/addons/document_webdav/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/pt.po b/addons/document_webdav/i18n/pt.po
index a82237dfdfe..6af1b9c5a35 100644
--- a/addons/document_webdav/i18n/pt.po
+++ b/addons/document_webdav/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po
index 057d27ed21c..03e908b9098 100644
--- a/addons/document_webdav/i18n/pt_BR.po
+++ b/addons/document_webdav/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/sl.po b/addons/document_webdav/i18n/sl.po
index 71e574e1c98..fb822df0248 100644
--- a/addons/document_webdav/i18n/sl.po
+++ b/addons/document_webdav/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/sv.po b/addons/document_webdav/i18n/sv.po
index d88fb7be7e9..c5d013723b9 100644
--- a/addons/document_webdav/i18n/sv.po
+++ b/addons/document_webdav/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
index 0fbb3657c57..f53c1da90c6 100644
--- a/addons/document_webdav/i18n/zh_CN.po
+++ b/addons/document_webdav/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/event/__terp__.py b/addons/event/__openerp__.py
similarity index 100%
rename from addons/event/__terp__.py
rename to addons/event/__openerp__.py
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 3655e73afe6..cb13b0662a8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,146 +1,146 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" sequence="9"/>
-		<menuitem name="Events Organisation" id="menu_event_main" parent="menu_marketing_event_main" />
-	<!-- EVENTS  -->
-		<!--<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" />-->
+    <data>
+        <menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" sequence="9"/>
+        <menuitem name="Events Organisation" id="menu_event_main" parent="menu_marketing_event_main" />
+    <!-- EVENTS  -->
+        <!--<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" />-->
 
-	<!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
-		<record model="ir.ui.view" id="view_event_type_form">
-			<field name="name">Event type</field>
-			<field name="model">event.type</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Event Type">
-					<field name="name" select="1"/>
-				</form>
-			</field>
-		</record>
+    <!-- EVENTS/CONFIGURATION/TYPE OF EVENTS -->
+        <record model="ir.ui.view" id="view_event_type_form">
+            <field name="name">Event type</field>
+            <field name="model">event.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Event Type">
+                    <field name="name" select="1"/>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_event_type_tree">
-			<field name="name">Event type</field>
-			<field name="model">event.type</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Event Type">
-					<field name="name"/>
-				</tree>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_event_type_tree">
+            <field name="name">Event type</field>
+            <field name="model">event.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Event Type">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="action_event_type">
-			<field name="res_model">event.type</field>
-			<field name="view_type">form</field>
-		</record>
-		<menuitem name="Configuration" id="menu_event_config" parent="menu_marketing_event_main" sequence="30"/>
-		<menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config"/>
+        <record model="ir.actions.act_window" id="action_event_type">
+            <field name="res_model">event.type</field>
+            <field name="view_type">form</field>
+        </record>
+        <menuitem name="Configuration" id="menu_event_config" parent="menu_marketing_event_main" sequence="30"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="menu_event_config"/>
 
-		<!-- The base section for all events -->
+        <!-- The base section for all events -->
 
-		<record model="ir.actions.act_window" id="action_event_categories">
-			<field name="name">Events by section</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">crm.case.section</field>
-			<field name="domain" eval="[('parent_id','=',False)]" />
-			<field name="view_type">tree</field>
-		</record>
-		<menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/>
+        <record model="ir.actions.act_window" id="action_event_categories">
+            <field name="name">Events by section</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="domain" eval="[('parent_id','=',False)]" />
+            <field name="view_type">tree</field>
+        </record>
+        <menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/>
 
 
-	<!-- Events Organisation/CONFIGURATION/EVENTS  -->
+    <!-- Events Organisation/CONFIGURATION/EVENTS  -->
 
-		<record model="ir.ui.view" id="view_event_form">
-			<field name="name">Events</field>
-			<field name="model">event.event</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Events">
-					<group col="6" colspan="4">
-						<field name="name" string="Event" select="1"/>
-						<field name="type" select="2"/>
-						<field name="user_id" select="1"/>
-						<field name="date_begin" select="1"/>
-						<field name="date_end" select="2"/>
-						<field name="product_id"/>
-					</group>
-					<notebook colspan="4">
-					<page string="General">
-						<separator string="Event description" colspan="4"/>
-						<field name="parent_id" domain="[('parent_id','child_of','Event')]" string="Parent Category"/>
-						<field name="active"/>
-						<field name="register_min" select="2"/>
-						<field name="register_max" select="2"/>
-						<separator string="Status" colspan="4"/>
-						<field name="state" select="1"/>
-						<group col="4" colspan="2">
+        <record model="ir.ui.view" id="view_event_form">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Events">
+                    <group col="6" colspan="4">
+                        <field name="name" string="Event" select="1"/>
+                        <field name="type"/>
+                        <field name="user_id" select="1"/>
+                        <field name="date_begin" select="1"/>
+                        <field name="date_end"/>
+                        <field name="product_id"/>
+                    </group>
+                    <notebook colspan="4">
+                    <page string="General">
+                        <separator string="Event description" colspan="4"/>
+                        <field name="parent_id" domain="[('parent_id','child_of','Event')]" string="Parent Category"/>
+                        <field name="active"/>
+                        <field name="register_min"/>
+                        <field name="register_max"/>
+                        <separator string="Status" colspan="4"/>
+                        <field name="state" select="1"/>
+                        <group col="4" colspan="2">
                            <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
                            <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
                            <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
                            <button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
-						</group>
-					</page>
-					<page string="Mailing">
-						<field name="reply_to"/>
-						<separator string="Auto Registration Email" colspan="4"/>
-						<field name="mail_auto_registr"/>
-						<newline/>
-						<field name="mail_registr" colspan="4"/>
-						<separator string="Auto Confirmation Email" colspan="4"/>
-						<field name="mail_auto_confirm"/>
-						<newline/>
-						<field name="mail_confirm" colspan="4"/>
-						<newline/>
-					</page>
-					<page string="Statistics">
-						<separator string="Registrations" colspan="4"/>
-						<field name="register_current"/>
-						<field name="register_prospect"/>
-					</page>
-					</notebook>
-			</form>
-			</field>
-		</record>
+                        </group>
+                    </page>
+                    <page string="Mailing">
+                        <field name="reply_to"/>
+                        <separator string="Auto Registration Email" colspan="4"/>
+                        <field name="mail_auto_registr"/>
+                        <newline/>
+                        <field name="mail_registr" colspan="4"/>
+                        <separator string="Auto Confirmation Email" colspan="4"/>
+                        <field name="mail_auto_confirm"/>
+                        <newline/>
+                        <field name="mail_confirm" colspan="4"/>
+                        <newline/>
+                    </page>
+                    <page string="Statistics">
+                        <separator string="Registrations" colspan="4"/>
+                        <field name="register_current"/>
+                        <field name="register_prospect"/>
+                    </page>
+                    </notebook>
+            </form>
+            </field>
+        </record>
 
-		<!-- event.event tree view -->
-		<record model="ir.ui.view" id="view_event_tree">
-			<field name="name">event.event.tree</field>
-			<field name="model">event.event</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
-					<field name="name" string="Name"/>
-					<field name="user_id"/>
-					<field name="date_begin"/>
-					<field name="register_min"/>
-					<field name="register_current"/>
-					<field name="state"/>
-				</tree>
-			</field>
-		</record>
+        <!-- event.event tree view -->
+        <record model="ir.ui.view" id="view_event_tree">
+            <field name="name">event.event.tree</field>
+            <field name="model">event.event</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
+                    <field name="name" string="Name"/>
+                    <field name="user_id"/>
+                    <field name="date_begin"/>
+                    <field name="register_min"/>
+                    <field name="register_current"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_event_search">
-			<field name="name">Events</field>
-			<field name="model">event.event</field>
-			<field name="type">search</field>
-			<field name="arch" type="xml">
-				<search string="Events">
-					<group col="10" colspan="4">
-						<filter icon="gtk-execute" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
-						<separator orientation="vertical"/>
-						<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
-						<filter icon="terp-calendar" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
-						<separator orientation="vertical"/>
-						<field name="name" string="Event" select="1"/>
-						<field name="user_id" select="1"/>
-						<field name="date_begin" select="1"/>
-						<field name="state" select="1"/>
-					</group>
-				</search>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_event_search">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Events">
+                    <group col="10" colspan="4">
+                        <filter icon="gtk-execute" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
+                        <filter icon="terp-calendar" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" string="Event" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="date_begin" select="1"/>
+                        <field name="state" select="1"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
-	<!-- Events Organisation/CONFIGURATION/EVENTS  -->
+    <!-- Events Organisation/CONFIGURATION/EVENTS  -->
        <record model="ir.actions.act_window" id="action_event_view">
            <field name="name">Events</field>
            <field name="type">ir.actions.act_window</field>
@@ -152,232 +152,232 @@
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="menu_event_main" />
 
-	<!-- EVENTS/REGISTRATIONS/EVENTS  -->
+    <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
-		<!-- Registration view (form) by _inherits  .................. -->
-		<record model="ir.ui.view" id="event_registration_tree">
-			<field name="name">event.registration.tree</field>
-			<field name="model">event.registration</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Registration">
-					<field name="id"/>
-					<field name="create_date"/>
-					<field name="event_id"/>
-					<field name="partner_id"/>
-					<field name="nb_register"/>
-					<field name="state"/>
-				</tree>
-			</field>
-		</record>
+        <!-- Registration view (form) by _inherits  .................. -->
+        <record model="ir.ui.view" id="event_registration_tree">
+            <field name="name">event.registration.tree</field>
+            <field name="model">event.registration</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Registration">
+                    <field name="id"/>
+                    <field name="create_date"/>
+                    <field name="event_id"/>
+                    <field name="partner_id"/>
+                    <field name="nb_register"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="event_registration_form">
-			<field name="name">event.registration.form</field>
-			<field name="model">event.registration</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Registration">
-					<group col="6" colspan="4">
-						<field name="event_id" select="1" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
-						<field name="nb_register"/>
-						<group colspan="2">
-							<field name="user_id" select="1"/>
+        <record model="ir.ui.view" id="event_registration_form">
+            <field name="name">event.registration.form</field>
+            <field name="model">event.registration</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Registration">
+                    <group col="6" colspan="4">
+                        <field name="event_id" select="1" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
+                        <field name="nb_register"/>
+                        <group colspan="2">
+                            <field name="user_id" select="1"/>
                             <button name="remind_user" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
-						</group>
-						<field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id,event_id)" />
-						<field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
-						<field name="unit_price" select="2"/>
-					</group>
-					<notebook colspan="4">
-					<page string="General">
-						<field name="contact_id" select="2" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
-						<field name="email_from" select="2"/>
+                        </group>
+                        <field name="partner_id" required="1" select="1" on_change="onchange_partner_id(partner_id,event_id)" />
+                        <field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
+                        <field name="unit_price"/>
+                    </group>
+                    <notebook colspan="4">
+                    <page string="General">
+                        <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" /><newline/>
+                        <field name="email_from"/>
                         <button name="remind_partner" string="Send Reminder" states="open,pending" type="object" colspan="2" icon="gtk-go-forward"/>
-						<newline/>
-						<separator string="Badge" colspan="4"/>
-						<field name="badge_title" select="2"/>
-						<field name="badge_name" select="2" on_change="onchange_badge_name(badge_name)"/>
-						<field name="badge_partner" select="2"/>
-						<newline/>
-						<separator string="Status" colspan="4"/>
-						<group col="8" colspan="4">
-							<field name="state" select="1" colspan="2"/>
+                        <newline/>
+                        <separator string="Badge" colspan="4"/>
+                        <field name="badge_title"/>
+                        <field name="badge_name" on_change="onchange_badge_name(badge_name)"/>
+                        <field name="badge_partner"/>
+                        <newline/>
+                        <separator string="Status" colspan="4"/>
+                        <group col="8" colspan="4">
+                            <field name="state" select="1" colspan="2"/>
                             <button name="button_reg_close" string="Registration Invoiced" states="open" type="object" icon="gtk-print"/>
                             <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                             <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-						</group>
-					</page>
-					<page string="Extra Info">
-						<field name="name" select="1" colspan="4"/>
-						<field name="id" select="1"/>
-						<field name="active" select="2"/>
-						<field name="email_cc" colspan="4"/>
-						<field name="categ_id" select="2" on_change="onchange_categ_id(categ_id)"/>
-						<separator colspan="4" string="Dates"/>
-						<field name="create_date"/>
-						<field name="date_closed"/>
-						<separator colspan="4" string="References"/>
-						<field name="ref" colspan="4"/>
-						<field name="ref2" colspan="4"/>
-					</page>
-					<page string="History">
+                        </group>
+                    </page>
+                    <page string="Extra Info">
+                        <field name="name" select="1" colspan="4"/>
+                        <field name="id" select="1"/>
+                        <field name="active"/>
+                        <field name="email_cc" colspan="4"/>
+                        <field name="categ_id" on_change="onchange_categ_id(categ_id)"/>
+                        <separator colspan="4" string="Dates"/>
+                        <field name="create_date"/>
+                        <field name="date_closed"/>
+                        <separator colspan="4" string="References"/>
+                        <field name="ref" colspan="4"/>
+                        <field name="ref2" colspan="4"/>
+                    </page>
+                    <page string="History">
                         <field name="history_line" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Communication history">
-								<field name="date"/>
-								<field name="som"/>
-								<newline/>
-								<field name="canal_id"/>
-								<field name="email"/>
-								<newline/>
-								<field name="description" colspan="4"/>
-							</form>
-							<tree string="Communication history">
-								<field name="date"/>
-								<field name="description"/>
-								<field name="som"/>
-								<field name="user_id"/>
-								<field name="canal_id"/>
-							</tree>
-						</field>
-						<field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
-							<tree string="Actions">
-								<separator string="Action Information" colspan="4"/>
-								<field name="name"/>
-								<field name="date"/>
-								<field name="user_id"/>
-							</tree>
-							<form string="Actions">
-								<separator string="Action Information" colspan="4"/>
-								<field name="name" colspan="4"/>
-								<field name="date" select="2"/>
-								<field name="user_id" select="2"/>
-							</form>
-						</field>
-					</page>
-					<page string="Payments">
-						<field name="invoice_label" select="1"/>
-						<field name="tobe_invoiced" select="1"/>
-						<field name="invoice_id"/>
-					</page>
-					</notebook>
-				</form>
-			</field>
-		</record>
+                                <field name="date"/>
+                                <field name="som"/>
+                                <newline/>
+                                <field name="canal_id"/>
+                                <field name="email"/>
+                                <newline/>
+                                <field name="description" colspan="4"/>
+                            </form>
+                            <tree string="Communication history">
+                                <field name="date"/>
+                                <field name="description"/>
+                                <field name="som"/>
+                                <field name="user_id"/>
+                                <field name="canal_id"/>
+                            </tree>
+                        </field>
+                        <field name="log_ids" nolabel="1" colspan="4" mode="tree,form" readonly="1">
+                            <tree string="Actions">
+                                <separator string="Action Information" colspan="4"/>
+                                <field name="name"/>
+                                <field name="date"/>
+                                <field name="user_id"/>
+                            </tree>
+                            <form string="Actions">
+                                <separator string="Action Information" colspan="4"/>
+                                <field name="name" colspan="4"/>
+                                <field name="date"/>
+                                <field name="user_id"/>
+                            </form>
+                        </field>
+                    </page>
+                    <page string="Payments">
+                        <field name="invoice_label" select="1"/>
+                        <field name="tobe_invoiced" select="1"/>
+                        <field name="invoice_id"/>
+                    </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_registration_search">
-			<field name="name">Registrations</field>
-			<field name="model">event.registration</field>
-			<field name="type">search</field>
-			<field name="arch" type="xml">
-				<search string="Event Registration">
-					<group col="12" colspan="4">
-						<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Registrations"/>
-						<separator orientation="vertical"/>
-						<filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
-						<filter icon="terp-calendar" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
-						<separator orientation="vertical"/>
-						<field name="event_id" select="1"/>
-						<field name="user_id" select="1"/>
-						<field name="partner_id" select="1"/>
-						<field name="state" select="1"/>
-						<field name="invoice_label" select="1"/>
-					</group>
-				</search>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_registration_search">
+            <field name="name">Registrations</field>
+            <field name="model">event.registration</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Event Registration">
+                    <group col="12" colspan="4">
+                        <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Registrations"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-calendar" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
+                        <filter icon="terp-calendar" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="partner_id" select="1"/>
+                        <field name="state" select="1"/>
+                        <field name="invoice_label" select="1"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="action_registration">
-		  <field name="name">Registrations</field>
-		  <field name="res_model">event.registration</field>
-		  <field name="view_type">form</field>
-		  <field name="domain"></field>
-		  <field name="view_mode">tree,form</field>
-		  <field name="search_view_id" ref="view_registration_search"/>
-		</record>
-		<menuitem
-			name="Registrations"
-			id="menu_action_registration" parent="menu_event_main"
-			action="action_registration"/>
+        <record model="ir.actions.act_window" id="action_registration">
+          <field name="name">Registrations</field>
+          <field name="res_model">event.registration</field>
+          <field name="view_type">form</field>
+          <field name="domain"></field>
+          <field name="view_mode">tree,form</field>
+          <field name="search_view_id" ref="view_registration_search"/>
+        </record>
+        <menuitem
+            name="Registrations"
+            id="menu_action_registration" parent="menu_event_main"
+            action="action_registration"/>
 
-	<!-- report , event on registration... start -->
-		<record model="ir.ui.view" id="report_event_registration_tree">
-			<field name="name">report.event.registration.tree</field>
-			<field name="model">report.event.registration</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Event on Registration">
-					<field name="name" select="1"/>
-					<field name="date_begin" select="1"/>
-					<field name="date_end"/>
-					<field name="draft_state" select="2"/>
-					<field name="confirm_state" select="2"/>
-					<field name="register_max" select="2"/>
-				</tree>
-			</field>
-		</record>
+    <!-- report , event on registration... start -->
+        <record model="ir.ui.view" id="report_event_registration_tree">
+            <field name="name">report.event.registration.tree</field>
+            <field name="model">report.event.registration</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Event on Registration">
+                    <field name="name" select="1"/>
+                    <field name="date_begin" select="1"/>
+                    <field name="date_end"/>
+                    <field name="draft_state"/>
+                    <field name="confirm_state"/>
+                    <field name="register_max"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model ="ir.ui.view" id="report_event_registration_graph">
-			<field name="name">report.event.registration.graph</field>
-			<field name="model">report.event.registration</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Event on Registration" type="bar">
-					<field name="name"/>
-					<field name="draft_state" operator="+"/>
-					<field name="confirm_state" operator="+"/>
-					<field name="register_max" operator="+"/>
-				</graph>
-			</field>
-		</record>
+        <record model ="ir.ui.view" id="report_event_registration_graph">
+            <field name="name">report.event.registration.graph</field>
+            <field name="model">report.event.registration</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Event on Registration" type="bar">
+                    <field name="name"/>
+                    <field name="draft_state" operator="+"/>
+                    <field name="confirm_state" operator="+"/>
+                    <field name="register_max" operator="+"/>
+                </graph>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="action_event_registration">
-			<field name="name">Events On Registrations</field>
-			<field name="res_model">report.event.registration</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,graph</field>
-		</record>
-		<menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
-		<!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
-		<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration" />
-	<!-- end... -->
+        <record model="ir.actions.act_window" id="action_event_registration">
+            <field name="name">Events On Registrations</field>
+            <field name="res_model">report.event.registration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+        </record>
+        <menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
+        <!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
+        <menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration" />
+    <!-- end... -->
 
 
-	<!-- report , event  type on registration... start -->
-		<record model="ir.ui.view" id="report_event_type_registration_tree">
-			<field name="name">report.event.type.registration.tree</field>
-			<field name="model">report.event.type.registration</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Registration By Event Types">
-					<field name="name" select="1"/>
-					<field name="nbevent"/>
-					<field name="draft_state" select="2"/>
-					<field name="confirm_state" select="2"/>
-				</tree>
-			</field>
-		</record>
+    <!-- report , event  type on registration... start -->
+        <record model="ir.ui.view" id="report_event_type_registration_tree">
+            <field name="name">report.event.type.registration.tree</field>
+            <field name="model">report.event.type.registration</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Registration By Event Types">
+                    <field name="name" select="1"/>
+                    <field name="nbevent"/>
+                    <field name="draft_state"/>
+                    <field name="confirm_state"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="report_event_type_registration_graph">
-			<field name="name">report.event.type.registration.graph</field>
-			<field name="model">report.event.type.registration</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Registration By Event Types" type="bar">
-					<field name="name"/>
-					<field name="draft_state" operator="+"/>
-					<field name="confirm_state" operator="+"/>
-				</graph>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="report_event_type_registration_graph">
+            <field name="name">report.event.type.registration.graph</field>
+            <field name="model">report.event.type.registration</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Registration By Event Types" type="bar">
+                    <field name="name"/>
+                    <field name="draft_state" operator="+"/>
+                    <field name="confirm_state" operator="+"/>
+                </graph>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="action_event_type_registration">
-			<field name="name">Registration By Event Types</field>
-			<field name="res_model">report.event.type.registration</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree</field>
-		</record>
-			<menuitem parent="menu_report_event" action="action_event_type_registration" id="menu_report_event_type_registration"/>
+        <record model="ir.actions.act_window" id="action_event_type_registration">
+            <field name="name">Registration By Event Types</field>
+            <field name="res_model">report.event.type.registration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+        </record>
+            <menuitem parent="menu_report_event" action="action_event_type_registration" id="menu_report_event_type_registration"/>
 
-	<!-- end...  -->
-	</data>
+    <!-- end...  -->
+    </data>
 </openerp>
diff --git a/addons/event/i18n/ar.po b/addons/event/i18n/ar.po
index a1855d44c07..1d34f8777cd 100644
--- a/addons/event/i18n/ar.po
+++ b/addons/event/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/bg.po b/addons/event/i18n/bg.po
index 486f2bf0690..20536a4be8a 100644
--- a/addons/event/i18n/bg.po
+++ b/addons/event/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/bs.po b/addons/event/i18n/bs.po
index 357f618d459..1bf9fdce43c 100644
--- a/addons/event/i18n/bs.po
+++ b/addons/event/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/ca.po b/addons/event/i18n/ca.po
index 0815a9c44f4..c613b4e7b73 100644
--- a/addons/event/i18n/ca.po
+++ b/addons/event/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/cs.po b/addons/event/i18n/cs.po
index 5a5f7951333..dd56f6cd3f7 100644
--- a/addons/event/i18n/cs.po
+++ b/addons/event/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index ed0cb5572a8..e276b4a21ab 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po
index 3a84166acbf..c01c04fd22d 100644
--- a/addons/event/i18n/es.po
+++ b/addons/event/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/es_AR.po b/addons/event/i18n/es_AR.po
index 7976203a54f..b0d04ba329b 100644
--- a/addons/event/i18n/es_AR.po
+++ b/addons/event/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
index 1e926a6af32..d184aebb4cc 100644
--- a/addons/event/i18n/et.po
+++ b/addons/event/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/fi.po b/addons/event/i18n/fi.po
index 1b4c8eb6eea..8ee9e8a34f3 100644
--- a/addons/event/i18n/fi.po
+++ b/addons/event/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index 42875f6a2ad..888aa1e3ceb 100644
--- a/addons/event/i18n/fr.po
+++ b/addons/event/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/hi.po b/addons/event/i18n/hi.po
index aec45910056..26c10e0b636 100644
--- a/addons/event/i18n/hi.po
+++ b/addons/event/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/hr.po b/addons/event/i18n/hr.po
index 8701e7362d4..1d34f8777cd 100644
--- a/addons/event/i18n/hr.po
+++ b/addons/event/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/hu.po b/addons/event/i18n/hu.po
index a9f6dc42907..4795f1212b3 100644
--- a/addons/event/i18n/hu.po
+++ b/addons/event/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/id.po b/addons/event/i18n/id.po
index 4d11ebf10ae..f5003233901 100644
--- a/addons/event/i18n/id.po
+++ b/addons/event/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/it.po b/addons/event/i18n/it.po
index 1af949ba348..d46161fb244 100644
--- a/addons/event/i18n/it.po
+++ b/addons/event/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/ko.po b/addons/event/i18n/ko.po
index b638e140d1b..8dd891d0a31 100644
--- a/addons/event/i18n/ko.po
+++ b/addons/event/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/lt.po b/addons/event/i18n/lt.po
index bd1d55de827..9b4b8a498ce 100644
--- a/addons/event/i18n/lt.po
+++ b/addons/event/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
index d819bec899c..c14dfd11ae0 100644
--- a/addons/event/i18n/nl.po
+++ b/addons/event/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/nl_BE.po b/addons/event/i18n/nl_BE.po
index df5d84c033f..7f6410f83c2 100644
--- a/addons/event/i18n/nl_BE.po
+++ b/addons/event/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/pl.po b/addons/event/i18n/pl.po
index 8b9de7c4edc..c53c8ece373 100644
--- a/addons/event/i18n/pl.po
+++ b/addons/event/i18n/pl.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:36+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-19 06:52+0000\n"
+"Last-Translator: Łukasz Przybylok <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-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:report.event.registration,date_end:0
 msgid "Ending date"
-msgstr ""
+msgstr "Data zakończenia"
 
 #. module: event
 #: field:event.event,register_min:0
@@ -40,27 +40,27 @@ msgstr ""
 #. module: event
 #: model:crm.case.section,name:event.event_0_crm_case_section
 msgid "Concert of Bon Jovi"
-msgstr ""
+msgstr "Koncert Bon Jovi"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr ""
+msgstr "Email potwierdzający"
 
 #. module: event
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych sekcji."
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration
 msgid "Event Registration"
-msgstr ""
+msgstr "Rejestracja wydarzenia"
 
 #. module: event
 #: model:ir.actions.wizard,name:event.event_reg_invoice
 msgid "Make Invoice"
-msgstr ""
+msgstr "Utwórz fakturę"
 
 #. module: event
 #: field:report.event.type.registration,draft_state:0
diff --git a/addons/event/i18n/pt.po b/addons/event/i18n/pt.po
index 3d340cfcc61..cbc5941d304 100644
--- a/addons/event/i18n/pt.po
+++ b/addons/event/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/pt_BR.po b/addons/event/i18n/pt_BR.po
index 0c20c1e8bce..2ed464faae4 100644
--- a/addons/event/i18n/pt_BR.po
+++ b/addons/event/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/ro.po b/addons/event/i18n/ro.po
index c655a1580ea..bc523bb9eb0 100644
--- a/addons/event/i18n/ro.po
+++ b/addons/event/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po
index d39ffbcf2d9..d1bdc82304c 100644
--- a/addons/event/i18n/ru.po
+++ b/addons/event/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/sk.po b/addons/event/i18n/sk.po
index c6e9915f702..5449ed3a9f5 100644
--- a/addons/event/i18n/sk.po
+++ b/addons/event/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/sl.po b/addons/event/i18n/sl.po
index 3d1c70853b8..31c3562eb63 100644
--- a/addons/event/i18n/sl.po
+++ b/addons/event/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/sv.po b/addons/event/i18n/sv.po
index 94d5f34970f..8f171865d9b 100644
--- a/addons/event/i18n/sv.po
+++ b/addons/event/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/tlh.po b/addons/event/i18n/tlh.po
index 7236ae1a4f4..68ec81b7ac8 100644
--- a/addons/event/i18n/tlh.po
+++ b/addons/event/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/tr.po b/addons/event/i18n/tr.po
index 41f0d2d617a..3a65951359b 100644
--- a/addons/event/i18n/tr.po
+++ b/addons/event/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/uk.po b/addons/event/i18n/uk.po
index 122965ed302..b04c48d5241 100644
--- a/addons/event/i18n/uk.po
+++ b/addons/event/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index b815a1fd337..5939e382ff2 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index f6bb06c558e..245e6c45e78 100644
--- a/addons/event/i18n/zh_TW.po
+++ b/addons/event/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
diff --git a/addons/event_project/__terp__.py b/addons/event_project/__openerp__.py
similarity index 100%
rename from addons/event_project/__terp__.py
rename to addons/event_project/__openerp__.py
diff --git a/addons/event_project/event_view.xml b/addons/event_project/event_view.xml
index ce4b2ba1129..86887faf1d6 100644
--- a/addons/event_project/event_view.xml
+++ b/addons/event_project/event_view.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
-	<!-- EVENTS  -->
+    <!-- EVENTS  -->
 
-		<record model="ir.ui.view" id="view_event_form_inherited">
-			<field name="name">Events</field>
-			<field name="model">event.event</field>
-			<field name="inherit_id" ref="event.view_event_form"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="register_max" position="after">
-					<separator string="Tasks management" colspan="4"/>
-					<field name="project_id"/>
+        <record model="ir.ui.view" id="view_event_form_inherited">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
+            <field name="inherit_id" ref="event.view_event_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="register_max" position="after">
+                    <separator string="Tasks management" colspan="4"/>
+                    <field name="project_id"/>
                     <button string="Create Retro-Planning" name="%(event_wiz)d" type="action" icon="gtk-execute"/>
-				</field>
-			</field>
-		</record>
+                </field>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_event_form_inherited2">
-			<field name="name">Events</field>
-			<field name="model">event.event</field>
-			<field name="inherit_id" ref="event.view_event_form"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="register_prospect" position="after">
-					<field name="task_ids" colspan="4" nolabel="1" widget="one2many_list" >
-					   <tree string="All tasks" colors="red:date_deadline&lt;current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state in ('cancel','done');black:state not in ('cancel','done')">
-							<field name="sequence"/>
-							<field name="name"/>
-							<field name="user_id" />
-							<field name="date_deadline" />
-							<field name="planned_hours" widget="float_time"/>
-							<field name="effective_hours" widget="float_time"/>
-							<field name="state" />
-						</tree>
-					</field>
-				</field>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_event_form_inherited2">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
+            <field name="inherit_id" ref="event.view_event_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="register_prospect" position="after">
+                    <field name="task_ids" colspan="4" nolabel="1" widget="one2many_list" >
+                       <tree string="All tasks" colors="red:date_deadline&lt;current_date and state=='draft';blue:date_deadline==current_date and state=='draft';grey:state in ('cancel','done');black:state not in ('cancel','done')">
+                            <field name="sequence"/>
+                            <field name="name"/>
+                            <field name="user_id" />
+                            <field name="date_deadline" />
+                            <field name="planned_hours" widget="float_time"/>
+                            <field name="effective_hours" widget="float_time"/>
+                            <field name="state" />
+                        </tree>
+                    </field>
+                </field>
+            </field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/event_project/i18n/ar.po b/addons/event_project/i18n/ar.po
index 22e579dcc4a..35d0e89da10 100644
--- a/addons/event_project/i18n/ar.po
+++ b/addons/event_project/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/bg.po b/addons/event_project/i18n/bg.po
index 47363d4efcf..66513785f17 100644
--- a/addons/event_project/i18n/bg.po
+++ b/addons/event_project/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/bs.po b/addons/event_project/i18n/bs.po
index 813407f637e..3bdeebc33ae 100644
--- a/addons/event_project/i18n/bs.po
+++ b/addons/event_project/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/ca.po b/addons/event_project/i18n/ca.po
index 5ffd138dd00..dbab1501895 100644
--- a/addons/event_project/i18n/ca.po
+++ b/addons/event_project/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/cs.po b/addons/event_project/i18n/cs.po
index cec73cc1a6a..16cdfec30bd 100644
--- a/addons/event_project/i18n/cs.po
+++ b/addons/event_project/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/de.po b/addons/event_project/i18n/de.po
index 23946e6e140..a67df42c0d0 100644
--- a/addons/event_project/i18n/de.po
+++ b/addons/event_project/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/es.po b/addons/event_project/i18n/es.po
index 694f6c25d19..08034d234df 100644
--- a/addons/event_project/i18n/es.po
+++ b/addons/event_project/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/es_AR.po b/addons/event_project/i18n/es_AR.po
index c2f6dfd3ace..66c8403a281 100644
--- a/addons/event_project/i18n/es_AR.po
+++ b/addons/event_project/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/et.po b/addons/event_project/i18n/et.po
index e1013400604..d35a7d80a59 100644
--- a/addons/event_project/i18n/et.po
+++ b/addons/event_project/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/fr.po b/addons/event_project/i18n/fr.po
index 7d3bce0e7df..356357e877b 100644
--- a/addons/event_project/i18n/fr.po
+++ b/addons/event_project/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/gl.po b/addons/event_project/i18n/gl.po
index 09d707fc777..7929c04dfce 100644
--- a/addons/event_project/i18n/gl.po
+++ b/addons/event_project/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/hi.po b/addons/event_project/i18n/hi.po
index 72858e7ab62..4fb1c61fc97 100644
--- a/addons/event_project/i18n/hi.po
+++ b/addons/event_project/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/hr.po b/addons/event_project/i18n/hr.po
index 24a622a8663..c59062bbdf5 100644
--- a/addons/event_project/i18n/hr.po
+++ b/addons/event_project/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/hu.po b/addons/event_project/i18n/hu.po
index 22e579dcc4a..35d0e89da10 100644
--- a/addons/event_project/i18n/hu.po
+++ b/addons/event_project/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/id.po b/addons/event_project/i18n/id.po
index 4f676f97312..83e1ba44351 100644
--- a/addons/event_project/i18n/id.po
+++ b/addons/event_project/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/it.po b/addons/event_project/i18n/it.po
index 760bba8bd16..56c6a9c6bcf 100644
--- a/addons/event_project/i18n/it.po
+++ b/addons/event_project/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/ko.po b/addons/event_project/i18n/ko.po
index 90c1baf6391..3b416ee7e83 100644
--- a/addons/event_project/i18n/ko.po
+++ b/addons/event_project/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/lt.po b/addons/event_project/i18n/lt.po
index 22e579dcc4a..35d0e89da10 100644
--- a/addons/event_project/i18n/lt.po
+++ b/addons/event_project/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/nl.po b/addons/event_project/i18n/nl.po
index 1e396bbbd59..60c33ea9791 100644
--- a/addons/event_project/i18n/nl.po
+++ b/addons/event_project/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/nl_BE.po b/addons/event_project/i18n/nl_BE.po
index 823f9007519..340a576e09b 100644
--- a/addons/event_project/i18n/nl_BE.po
+++ b/addons/event_project/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/pl.po b/addons/event_project/i18n/pl.po
index 2da3e4a6d72..b8f3ffa3bb6 100644
--- a/addons/event_project/i18n/pl.po
+++ b/addons/event_project/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/pt.po b/addons/event_project/i18n/pt.po
index 99ac98a9a37..7e57b89820c 100644
--- a/addons/event_project/i18n/pt.po
+++ b/addons/event_project/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/pt_BR.po b/addons/event_project/i18n/pt_BR.po
index e5c328df892..c44e9606e30 100644
--- a/addons/event_project/i18n/pt_BR.po
+++ b/addons/event_project/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/ro.po b/addons/event_project/i18n/ro.po
index 22e579dcc4a..35d0e89da10 100644
--- a/addons/event_project/i18n/ro.po
+++ b/addons/event_project/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/ru.po b/addons/event_project/i18n/ru.po
index 3e8b6176a15..dab93070509 100644
--- a/addons/event_project/i18n/ru.po
+++ b/addons/event_project/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/sl.po b/addons/event_project/i18n/sl.po
index 4d3efdcf21b..b5ba2db8495 100644
--- a/addons/event_project/i18n/sl.po
+++ b/addons/event_project/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/sv.po b/addons/event_project/i18n/sv.po
index 22e579dcc4a..35d0e89da10 100644
--- a/addons/event_project/i18n/sv.po
+++ b/addons/event_project/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/tlh.po b/addons/event_project/i18n/tlh.po
index b0305823411..e72d387b968 100644
--- a/addons/event_project/i18n/tlh.po
+++ b/addons/event_project/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/tr.po b/addons/event_project/i18n/tr.po
index 54fec9e4d9a..e2367eaa445 100644
--- a/addons/event_project/i18n/tr.po
+++ b/addons/event_project/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/uk.po b/addons/event_project/i18n/uk.po
index 3595e37eaed..50ded302ddd 100644
--- a/addons/event_project/i18n/uk.po
+++ b/addons/event_project/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/zh_CN.po b/addons/event_project/i18n/zh_CN.po
index 07fd5926c66..fafa9b05988 100644
--- a/addons/event_project/i18n/zh_CN.po
+++ b/addons/event_project/i18n/zh_CN.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "这动作定义中无效的模块名"
+msgstr "无效 View XML"
 
 #. module: event_project
 #: model:ir.actions.wizard,name:event_project.wizard_event_task
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "事件的组织和管理.\n"
 "\n"
-"    这模块允许你在你的事件创建补充计划管理.\n"
+"    这模块允许你创建反推计划来管理你的事件.\n"
 
 #. module: event_project
 #: view:event.event:0
@@ -73,7 +73,7 @@ msgstr "取消"
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr "创建补充计划"
+msgstr "创建反推计划"
 
 #. module: event_project
 #: wizard_view:event.project,init:0
diff --git a/addons/event_project/i18n/zh_TW.po b/addons/event_project/i18n/zh_TW.po
index 266d41d9aea..0c100cc5e57 100644
--- a/addons/event_project/i18n/zh_TW.po
+++ b/addons/event_project/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
diff --git a/addons/project_issue/wizard/__init__.py b/addons/fetchmail/__init__.py
similarity index 77%
rename from addons/project_issue/wizard/__init__.py
rename to addons/fetchmail/__init__.py
index 3ae599d66c3..0f50df83255 100644
--- a/addons/project_issue/wizard/__init__.py
+++ b/addons/fetchmail/__init__.py
@@ -1,9 +1,10 @@
-# -*- encoding: utf-8 -*-
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    mga@tinyerp.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
@@ -20,6 +21,4 @@
 #
 ##############################################################################
 
-
-import project_issue_wizard
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import fetchmail
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
new file mode 100644
index 00000000000..fc2b245f11f
--- /dev/null
+++ b/addons/fetchmail/__openerp__.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    mga@tinyerp.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/>.
+#
+##############################################################################
+
+{
+    "name" : "Fetchmail Server",
+    "version" : "1.0",
+    "depends" : ["base", "smtpclient"],
+    "author" : "Tiny",
+    "description": """Fetchail: 
+    * Fetch email from Pop / IMAP server
+    * Support SSL
+    * Integrated with all Modules
+    * Automatic Email Receive
+    * Email based Records (Add, Update)
+    """,
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+        "fetchmail_view.xml",
+        "fetchmail_data.xml"
+    ],
+    'demo_xml': [
+
+    ],
+    'installable': True,
+    'active': False,
+}
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
new file mode 100644
index 00000000000..565c4434607
--- /dev/null
+++ b/addons/fetchmail/fetchmail.py
@@ -0,0 +1,447 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution    
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    mga@tinyerp.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/>.
+#
+##############################################################################
+
+import os
+import re
+import time
+
+import email
+import binascii
+import mimetypes
+
+from imaplib import IMAP4
+from imaplib import IMAP4_SSL   
+
+from poplib import POP3
+from poplib import POP3_SSL
+
+from email.header import Header
+from email.header import decode_header
+
+import netsvc
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+logger = netsvc.Logger()
+
+def html2plaintext(html, body_id=None, encoding='utf-8'):
+    ## (c) Fry-IT, www.fry-it.com, 2007
+    ## <peter@fry-it.com>
+    ## download here: http://www.peterbe.com/plog/html2plaintext
+
+    """ from an HTML text, convert the HTML to plain text.
+    If @body_id is provided then this is the tag where the
+    body (not necessarily <body>) starts.
+    """
+    try:
+        from BeautifulSoup import BeautifulSoup, SoupStrainer, Comment
+    except:
+        return html
+
+    urls = []
+    if body_id is not None:
+        strainer = SoupStrainer(id=body_id)
+    else:
+        strainer = SoupStrainer('body')
+
+    soup = BeautifulSoup(html, parseOnlyThese=strainer, fromEncoding=encoding)
+    for link in soup.findAll('a'):
+        title = link.renderContents()
+        for url in [x[1] for x in link.attrs if x[0]=='href']:
+            urls.append(dict(url=url, tag=str(link), title=title))
+
+    html = soup.__str__()
+
+    url_index = []
+    i = 0
+    for d in urls:
+        if d['title'] == d['url'] or 'http://'+d['title'] == d['url']:
+            html = html.replace(d['tag'], d['url'])
+        else:
+            i += 1
+            html = html.replace(d['tag'], '%s [%s]' % (d['title'], i))
+            url_index.append(d['url'])
+
+    html = html.replace('<strong>','*').replace('</strong>','*')
+    html = html.replace('<b>','*').replace('</b>','*')
+    html = html.replace('<h3>','*').replace('</h3>','*')
+    html = html.replace('<h2>','**').replace('</h2>','**')
+    html = html.replace('<h1>','**').replace('</h1>','**')
+    html = html.replace('<em>','/').replace('</em>','/')
+
+    # the only line breaks we respect is those of ending tags and
+    # breaks
+
+    html = html.replace('\n',' ')
+    html = html.replace('<br>', '\n')
+    html = html.replace('<tr>', '\n')
+    html = html.replace('</p>', '\n\n')
+    html = re.sub('<br\s*/>', '\n', html)
+    html = html.replace(' ' * 2, ' ')
+
+    # for all other tags we failed to clean up, just remove then and
+    # complain about them on the stderr
+    def desperate_fixer(g):
+        #print >>sys.stderr, "failed to clean up %s" % str(g.group())
+        return ' '
+
+    html = re.sub('<.*?>', desperate_fixer, html)
+
+    # lstrip all lines
+    html = '\n'.join([x.lstrip() for x in html.splitlines()])
+
+    for i, url in enumerate(url_index):
+        if i == 0:
+            html += '\n\n'
+        html += '[%s] %s\n' % (i+1, url)
+    return html
+    
+class mail_server(osv.osv):
+    
+    _name = 'email.server'
+    _description = "POP/IMAP Server"
+    
+    _columns = {
+        'name':fields.char('Name', size=256, required=True, readonly=False),
+        'active':fields.boolean('Active', required=False),
+        'state':fields.selection([
+            ('draft','Not Confirme'),
+            ('wating','Waiting for Verification'),
+            ('done','Confirmed'),
+        ],'State', select=True, readonly=True),
+        'server' : fields.char('Server', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'port' : fields.integer('Port', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'type':fields.selection([
+            ('pop','POP Server'),
+            ('imap','IMAP Server'),
+        ],'State', select=True, readonly=False),
+        'is_ssl':fields.boolean('SSL ?', required=False),
+        'date': fields.date('Date'),
+        'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'note': fields.text('Description'),
+        'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]"),
+        'object_id': fields.many2one('ir.model',"Model", required=True),
+        'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly',False)]}, help="Priority between 0 to 10, select define the order of Processing"),
+    }
+    _defaults = {
+#        'type': lambda *a: "imap",
+        'state': lambda *a: "draft",
+        'active': lambda *a: True,
+        'priority': lambda *a: 5,
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+    }
+    
+    def check_duplicate(self, cr, uid, ids):
+        vals = self.read(cr, uid, ids, ['user', 'password'])[0]
+        cr.execute("select count(id) from email_server where user='%s' and password='%s'" % (vals['user'], vals['password']))
+        res = cr.fetchone()
+        if res:
+            if res[0] > 1:
+                return False
+        return True 
+
+    _constraints = [
+        (check_duplicate, 'Warning! Can\'t have duplicate server configuration!', ['user', 'password'])
+    ]
+    
+    def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False):
+        port = 0
+        if server_type == 'pop':
+            port = ssl and 995 or 110
+        elif server_type == 'imap':
+            port = ssl and 993 or 143
+        
+        return {'value':{'port':port}}
+    
+    def _process_email(self, cr, uid, server, message, context={}):
+        history_pool = self.pool.get('mail.server.history')
+        msg_txt = email.message_from_string(message)
+        message_id = msg_txt.get('Message-ID', False)
+        
+        msg = {}
+        if not message_id:
+            return False
+        
+        fields = msg_txt.keys()
+        
+        msg['id'] = message_id
+        msg['message-id'] = message_id
+        
+        if 'Subject' in fields:
+            msg['subject'] = msg_txt.get('Subject')
+        
+        if 'Content-Type' in fields:
+            msg['content-type'] = msg_txt.get('Content-Type')
+        
+        if 'From' in fields:
+            msg['from'] = msg_txt.get('From')
+        
+        if 'Delivered-To' in fields:
+            msg['to'] = msg_txt.get('Delivered-To')
+        
+        if 'Cc' in fields:
+            msg['cc'] = msg_txt.get('Cc')
+        
+        if 'Reply-To' in fields:
+            msg['reply'] = msg_txt.get('Reply-To')
+        
+        if 'Date' in fields:
+            msg['date'] = msg_txt.get('Date')
+        
+        if 'Content-Transfer-Encoding' in fields:
+            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
+        
+        if 'References' in fields:
+            msg['references'] = msg_txt.get('References')
+
+        if 'X-openerp-caseid' in fields:
+            msg['caseid'] = msg_txt.get('X-openerp-caseid')
+        
+        if 'X-Priority' in fields:
+            msg['priority'] = msg_txt.get('X-priority', '3 (Normal)').split(' ')[0]
+        
+        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', None):
+            msg['body'] = msg_txt.get_payload(decode=True)
+        
+        attachents = {}
+        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', None):
+            body = ""
+            counter = 1
+            for part in msg_txt.walk():
+                if part.get_content_maintype() == 'multipart':
+                    continue
+                
+                if part.get_content_maintype()=='text':
+                    content = part.get_payload(decode=True)
+                    if part.get_content_subtype() == 'html':
+                        body = html2plaintext(content)
+                    elif part.get_content_subtype() == 'plain':
+                        body = content
+                    
+                    filename = part.get_filename()
+                    if filename :
+                        attachents[filename] = part.get_payload(decode=True)
+                    
+                elif part.get_content_maintype()=='application' or part.get_content_maintype()=='image' or part.get_content_maintype()=='text':
+                    filename = part.get_filename();
+                    if filename :
+                        attachents[filename] = part.get_payload(decode=True)
+                    else:
+                        body += part.get_payload(decode=True)
+
+            msg['body'] = body
+            msg['attachments'] = attachents
+
+        res_id = False
+        if msg.get('references', False):
+            id = False
+            ref = msg.get('references')
+            if '\r\n' in ref:
+                ref = msg.get('references').split('\r\n')
+            else:
+                ref = msg.get('references').split(' ')
+                
+            if ref:
+                hids = history_pool.search(cr, uid, [('name','=',ref[0].strip())])
+                if hids:
+                    id = hids[0]
+                    history = history_pool.browse(cr, uid, id)
+                    model_pool = self.pool.get(server.object_id.model)
+                    context.update({
+                        'references_id':ref[0]
+                    })
+                    vals = {
+                    
+                    }
+                    if hasattr(model_pool, 'message_update'):
+                        model_pool.message_update(cr, uid, [history.res_id], vals, msg, context=context)
+                    else:
+                        logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_update is not define in model %s' % (model_pool._name))
+                        return False
+            res_id = id
+        else:
+            model_pool = self.pool.get(server.object_id.model)
+            if hasattr(model_pool, 'message_new'):
+                res_id = model_pool.message_new(cr, uid, msg, context)
+            else:
+                logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_new is not define in model %s' % (model_pool._name))
+                return False
+                
+            for attactment in attachents or []:
+                data_attach = {
+                    'name': attactment,
+                    'datas':binascii.b2a_base64(str(attachents.get(attactment))),
+                    'datas_fname': attactment,
+                    'description': 'Mail attachment',
+                    'res_model': server.object_id.model,
+                    'res_id': res_id,
+                }
+                self.pool.get('ir.attachment').create(cr, uid, data_attach)
+            
+            if server.action_id:
+                action_pool = self.pool.get('ir.actions.server')
+                action_pool.run(cr, uid, [server.action_id.id], {'active_id':res_id, 'active_ids':[res_id]})
+            
+            res = {
+                'name': message_id, 
+                'res_id': res_id, 
+                'server_id': server.id, 
+                'note': msg.get('body', msg.get('from')),
+                'ref_id':msg.get('references', msg.get('id')),
+                'type':server.type
+            }
+            his_id = history_pool.create(cr, uid, res)
+            
+        return res_id
+    
+    def _fetch_mails(self, cr, uid, ids=False, context={}):
+        if not ids:
+            ids = self.search(cr, uid, [])
+        return self.fetch_mail(cr, uid, ids, context)
+    
+    def fetch_mail(self, cr, uid, ids, context={}):
+        fp = os.popen('ping www.google.com -c 1 -w 5',"r")
+        if not fp.read():
+            logger.notifyChannel('imap', netsvc.LOG_WARNING, 'No address associated with hostname !')
+
+        for server in self.browse(cr, uid, ids, context):
+            logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
+            
+            try:
+                if server.type == 'imap':
+                    imap_server = None
+                    if server.is_ssl:
+                        imap_server = IMAP4_SSL(server.server, int(server.port))
+                    else:
+                        imap_server = IMAP4(server.server, int(server.port))
+                    
+                    imap_server.login(server.user, server.password)
+                    imap_server.select()
+                    result, data = imap_server.search(None, '(UNSEEN)')
+                    for num in data[0].split():
+                        result, data = imap_server.fetch(num, '(RFC822)')
+                        if self._process_email(cr, uid, server, data[0][1], context):
+                            imap_server.store(num, '+FLAGS', '\\Seen')
+                            count += 1
+                    logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch/process %s email(s) from %s' % (count, server.name))
+                    
+                    imap_server.close()
+                    imap_server.logout()
+                elif server.type == 'pop':
+                    pop_server = None
+                    if server.is_ssl:
+                        pop_server = POP3_SSL(server.server, int(server.port))
+                    else:
+                        pop_server = POP3(server.server, int(server.port))
+                    
+                    #TODO: use this to remove only unread messages
+                    #pop_server.user("recent:"+server.user)
+                    pop_server.user(server.user)
+                    pop_server.pass_(server.password)
+                    pop_server.list()
+
+                    (numMsgs, totalSize) = pop_server.stat()
+                    count = 0
+                    for num in range(1, numMsgs + 1):
+                        (header, msges, octets) = pop_server.retr(num)
+                        msg = '\n'.join(msges)
+                        self._process_email(cr, uid, server, msg, context)
+                        pop_server.dele(num)
+
+                    pop_server.quit()
+                    
+                    logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
+                    
+            except Exception, e:
+                logger.notifyChannel('IMAP', netsvc.LOG_WARNING, '%s' % (e))
+                
+        return True
+
+mail_server()
+
+class mail_server_history(osv.osv):
+
+    _name = "mail.server.history"
+    _description = "Mail Server History"
+    
+    _columns = {
+        'name': fields.char('Message Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
+        'ref_id': fields.char('Referance Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
+        'res_id': fields.integer("Resource ID", readonly=True, select=True),
+        'server_id': fields.many2one('email.server',"Mail Server", readonly=True, select=True),
+        'model_id':fields.related('server_id', 'object_id', type='many2one', relation='ir.model', string='Model', readonly=True, select=True), 
+        'note': fields.text('Notes', readonly=True),
+        'create_date': fields.datetime('Created Date', readonly=True),
+        'type':fields.selection([
+            ('pop','POP Server'),
+            ('imap','IMAP Server'),
+        ],'State', select=True, readonly=True),
+    }
+    _order = 'id desc'
+    
+mail_server_history()
+
+class fetchmail_tool(osv.osv):
+    """
+    OpenERP Model : fetchmail_tool
+    """
+    
+    _name = 'email.server.tools'
+    _description = "Email Tools"
+    _auto = False
+    
+    def to_email(self, text):
+        _email = re.compile(r'.*<.*@.*\..*>', re.UNICODE)
+        def record(path):
+            eml = path.group()
+            index = eml.index('<')
+            eml = eml[index:-1].replace('<','').replace('>','')
+            return eml
+
+        bits = _email.sub(record, text)
+        return bits
+    
+    def get_partner(self, cr, uid, from_email, context=None):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks
+        @param from_email: email address based on that function will search for the correct 
+        """
+        
+        res = {
+            'partner_address_id': False,
+            'partner_id': False
+        }
+        from_email = self.to_email(from_email)
+        address_ids = self.pool.get('res.partner.address').search(cr, uid, [('email', '=', from_email)])
+        if address_ids:
+            address = self.pool.get('res.partner.address').browse(cr, uid, address_ids[0])
+            res['partner_address_id'] = address_ids[0]
+            res['partner_id'] = address.partner_id.id
+        
+        return res
+        
+fetchmail_tool()
diff --git a/addons/mail_gateway/mail_gateway_data.xml b/addons/fetchmail/fetchmail_data.xml
similarity index 77%
rename from addons/mail_gateway/mail_gateway_data.xml
rename to addons/fetchmail/fetchmail_data.xml
index e13a7a845a5..ef40a76489f 100644
--- a/addons/mail_gateway/mail_gateway_data.xml
+++ b/addons/fetchmail/fetchmail_data.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record id="ir_cron_mail_gateway_action" model="ir.cron">
-            <field name="name">Check Email (Fetchmail)</field>
+            <field name="name">Fetchmail Service</field>
             <field name="interval_number">5</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
-            <field eval="'mail.gateway'" name="model"/>
+            <field eval="'email.server'" name="model"/>
             <field eval="'_fetch_mails'" name="function"/>
             <field eval="'()'" name="args"/>
         </record>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
new file mode 100644
index 00000000000..80d0b60a74f
--- /dev/null
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    
+        <record model="ir.ui.view" id="view_email_server_tree">
+            <field name="name">email.server.tree</field>
+            <field name="model">email.server</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="POP/IMAP Servers">
+                    <field name="name" select="1"/>
+                    <field name="type" select="1"/>
+                    <field name="user" select="1"/>
+                    <field name="is_ssl" select="1"/>
+                    <field name="state" select="1"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_email_server_form">
+            <field name="name">email.server.form</field>
+            <field name="model">email.server</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="POP/IMAP Server">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" colspan="4"/>
+                        <field name="type" select="1" on_change="onchange_server_type(type, is_ssl)"/>
+                        
+                        <field name="date" select="1"/>
+                        <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
+                        <field name="active" select="1"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Server &amp; Login">
+                            <group col="2" colspan="2">
+                                <separator string="Server Information" colspan="2"/>
+                                <field name="server" />
+                                <field name="port" />
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Login Information" colspan="2"/>
+                                <field name="user" />
+                                <field name="password" password="True" />
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Auto Reply?" colspan="2"/>
+                                <field name="action_id"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Process Parameter" colspan="2"/>
+                                <field name="object_id"/>
+                                <field name="priority"/>
+                            </group>
+                            <separator string="Description" colspan="4"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <group col="6" colspan="4">
+                        <field name="state" select="1"/>
+                        <button string="Verify Server" type="object" name="fetch_mail"/>
+                        <button string="Schedule"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="action_email_server_tree">
+            <field name="name">POP Servers</field>
+            <field name="res_model">email.server</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_email_server_tree"/>
+            <field name="context">{'type':'pop'}</field>
+            <field name="domain">[('type','=','pop')]</field>
+        </record>
+        
+        <menuitem 
+            parent="smtpclient.menu_smtpclient_administration_server" 
+            id="menu_action_email_server_tree" 
+            action="action_email_server_tree"
+        />
+        
+        <record model="ir.actions.act_window" id="action_email_server_tree_imap">
+            <field name="name">IMAP Servers</field>
+            <field name="res_model">email.server</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_email_server_tree"/>
+            <field name="context">{'type':'imap'}</field>
+            <field name="domain">[('type','=','imap')]</field>
+        </record>
+        
+        <menuitem 
+            parent="smtpclient.menu_smtpclient_administration_server" 
+            id="menu_action_email_server_tree_imap" 
+            action="action_email_server_tree_imap"
+        />
+        
+        <record model="ir.ui.view" id="view_mail_server_history_tree">
+            <field name="name">mail.server.history.tree</field>
+            <field name="model">mail.server.history</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Received Mail History">
+                    <field name="server_id" select="1"/>
+                    <field name="create_date" select="1"/>
+                    <field name="model_id"/>
+                    <field name="name" select="1"/>
+                    <field name="ref_id"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_email_server_history_form">
+            <field name="name">mail.server.history.form</field>
+            <field name="model">mail.server.history</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Email History">
+                    <group col="6" colspan="4">
+                        <field name="server_id" select="1"/>
+                        <field name="create_date" select="1"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Resource Information" colspan="2"/>
+                        <field name="model_id" select="1"/>
+                        <field name="res_id"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Meta Information" colspan="2"/>
+                        <field name="name" select="1"/>
+                        <field name="ref_id"/>
+                    </group>
+                    <newline/>
+                    <separator string="Description" colspan="4"/>
+                    <field name="note" colspan="4" nolabel="1"/>
+                </form>
+            </field>
+        </record>
+        
+        <act_window 
+            context="{'server_id': active_id}"
+            domain="[('server_id', '=', active_id)]"
+            id="act_server_history" name="Email History"
+            res_model="mail.server.history" src_model="email.server"/>
+            
+        <record model="ir.actions.act_window" id="action_email_server_history_tree">
+            <field name="name">Receive Email History</field>
+            <field name="res_model">mail.server.history</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_mail_server_history_tree"/>
+            <field name="context">{'type':'imap'}</field>
+            <field name="domain">[('type','=','imap')]</field>
+        </record>
+        
+        <menuitem 
+            parent="menu_action_email_server_tree_imap" 
+            id="menu_action_email_server_history_tree" 
+            action="action_email_server_history_tree"/>
+            
+        <record model="ir.actions.act_window" id="action_email_server_history_tree_pop">
+            <field name="name">Receive Email History</field>
+            <field name="res_model">mail.server.history</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_mail_server_history_tree"/>
+            <field name="context">{'type':'pop'}</field>
+            <field name="domain">[('type','=','pop')]</field>
+        </record>
+        
+        <menuitem 
+            parent="menu_action_email_server_tree" 
+            id="menu_action_email_server_history_tree_pop" 
+            action="action_email_server_history_tree_pop"/>
+    </data>
+</openerp>
diff --git a/addons/google_map/__terp__.py b/addons/google_map/__openerp__.py
similarity index 100%
rename from addons/google_map/__terp__.py
rename to addons/google_map/__openerp__.py
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index 3fd078ca408..7909b271cd4 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -1,57 +1,57 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
-		<record model="ir.ui.view" id="view_partner_address_form1_inheritg">
-			<field name="name">res.partner.address.form1.inheritg</field>
-			<field name="model">res.partner.address</field>
-			<field name="inherit_id" ref="base.view_partner_address_form1"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="street2" position="replace">
-					<label string="Street2 : " align="1.0"/>
-					<group colspan="1" col="2">
-						<field name="street2" nolabel="1"/>
-						<button name="%(wizard_google_map)d"
+        <record model="ir.ui.view" id="view_partner_address_form1_inheritg">
+            <field name="name">res.partner.address.form1.inheritg</field>
+            <field name="model">res.partner.address</field>
+            <field name="inherit_id" ref="base.view_partner_address_form1"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="street2" position="replace">
+                    <label string="Street2 : " align="1.0"/>
+                    <group colspan="1" col="2">
+                        <field name="street2" nolabel="1"/>
+                        <button name="%(wizard_google_map)d"
                            string="Map" type="action" icon="gtk-zoom-in"/>
-					</group>
-				</field>
-			</field>
-		</record>
+                    </group>
+                </field>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_partner_address_form2_inheritg">
-			<field name="name">res.partner.address.form2.inheritg</field>
-			<field name="model">res.partner.address</field>
-			<field name="inherit_id" ref="base.view_partner_address_form2"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="street2" position="replace">
-					<label string="Street2 : " align="1.0"/>
-					<group colspan="1" col="2">
-						<field name="street2" nolabel="1"/>
+        <record model="ir.ui.view" id="view_partner_address_form2_inheritg">
+            <field name="name">res.partner.address.form2.inheritg</field>
+            <field name="model">res.partner.address</field>
+            <field name="inherit_id" ref="base.view_partner_address_form2"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="street2" position="replace">
+                    <label string="Street2 : " align="1.0"/>
+                    <group colspan="1" col="2">
+                        <field name="street2" nolabel="1"/>
                         <button name="%(wizard_google_map)d" string="Map" type="action" icon="gtk-zoom-in"/>
-					</group>
-				</field>
-			</field>
-		</record>
+                    </group>
+                </field>
+            </field>
+        </record>
 
 
-		<record model="ir.ui.view" id="view_partner_form_inheritg">
-			<field name="name">res.partner.form.inheritg</field>
-			<field name="model">res.partner</field>
-			<field name="inherit_id" ref="base.view_partner_form"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="street2" position="replace">
-						<label string="Street2 : " align="1.0"/>
-						<group colspan="1" col="2">
-						<field name="street2" nolabel="1"/>
-						<button name="%(wizard_google_map)d"
+        <record model="ir.ui.view" id="view_partner_form_inheritg">
+            <field name="name">res.partner.form.inheritg</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="street2" position="replace">
+                        <label string="Street2 : " align="1.0"/>
+                        <group colspan="1" col="2">
+                        <field name="street2" nolabel="1"/>
+                        <button name="%(wizard_google_map)d"
                             string="Map" type="action" icon="gtk-zoom-in"/>
-						</group>
-					</field>
-				</field>
-		</record>
+                        </group>
+                    </field>
+                </field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/google_map/i18n/ar.po b/addons/google_map/i18n/ar.po
index 8548c831fee..cfa1e933f36 100644
--- a/addons/google_map/i18n/ar.po
+++ b/addons/google_map/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/bg.po b/addons/google_map/i18n/bg.po
index e434862994f..920321611a0 100644
--- a/addons/google_map/i18n/bg.po
+++ b/addons/google_map/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/bs.po b/addons/google_map/i18n/bs.po
index 81a6775e815..fa187f09dc6 100644
--- a/addons/google_map/i18n/bs.po
+++ b/addons/google_map/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ca.po b/addons/google_map/i18n/ca.po
index 6fa81a0580b..dd21a88ee09 100644
--- a/addons/google_map/i18n/ca.po
+++ b/addons/google_map/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/cs.po b/addons/google_map/i18n/cs.po
index 6d451e8972e..f2b5698f5ea 100644
--- a/addons/google_map/i18n/cs.po
+++ b/addons/google_map/i18n/cs.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-02-26 21:05+0000\n"
-"Last-Translator: Roman Horník <roman.hornik@gmail.com>\n"
+"Last-Translator: Roman Horník <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-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/da.po b/addons/google_map/i18n/da.po
index d1fdbc0c02d..defbf20c957 100644
--- a/addons/google_map/i18n/da.po
+++ b/addons/google_map/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/de.po b/addons/google_map/i18n/de.po
index 0243643ef54..7c9df8e1b26 100644
--- a/addons/google_map/i18n/de.po
+++ b/addons/google_map/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/el.po b/addons/google_map/i18n/el.po
index 9367045b4de..470cd95ee13 100644
--- a/addons/google_map/i18n/el.po
+++ b/addons/google_map/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/es.po b/addons/google_map/i18n/es.po
index 74a769f90fd..a4c0c6cdd74 100644
--- a/addons/google_map/i18n/es.po
+++ b/addons/google_map/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/es_AR.po b/addons/google_map/i18n/es_AR.po
index a7f814db5ee..cc893eaca16 100644
--- a/addons/google_map/i18n/es_AR.po
+++ b/addons/google_map/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/et.po b/addons/google_map/i18n/et.po
index 2c78b7d6709..cea1b3ec128 100644
--- a/addons/google_map/i18n/et.po
+++ b/addons/google_map/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/fi.po b/addons/google_map/i18n/fi.po
index 94b7c9d7e27..dc867b17312 100644
--- a/addons/google_map/i18n/fi.po
+++ b/addons/google_map/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/fr.po b/addons/google_map/i18n/fr.po
index e3278ce0f29..77db78e17f8 100644
--- a/addons/google_map/i18n/fr.po
+++ b/addons/google_map/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/gl.po b/addons/google_map/i18n/gl.po
index 17c35744862..98a9c8da77f 100644
--- a/addons/google_map/i18n/gl.po
+++ b/addons/google_map/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/hi.po b/addons/google_map/i18n/hi.po
index e26bd02d902..8d1b553957b 100644
--- a/addons/google_map/i18n/hi.po
+++ b/addons/google_map/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/hr.po b/addons/google_map/i18n/hr.po
index 77d339dcc69..bf657ca6421 100644
--- a/addons/google_map/i18n/hr.po
+++ b/addons/google_map/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/hu.po b/addons/google_map/i18n/hu.po
index 8b00fdb1e1c..16531b180bc 100644
--- a/addons/google_map/i18n/hu.po
+++ b/addons/google_map/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/id.po b/addons/google_map/i18n/id.po
index 475040f1112..baf9f67e5b4 100644
--- a/addons/google_map/i18n/id.po
+++ b/addons/google_map/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/it.po b/addons/google_map/i18n/it.po
index 4a0c1e4c4a5..efac19ef041 100644
--- a/addons/google_map/i18n/it.po
+++ b/addons/google_map/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ko.po b/addons/google_map/i18n/ko.po
index d68df7cba15..7ae2867bf6f 100644
--- a/addons/google_map/i18n/ko.po
+++ b/addons/google_map/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/lt.po b/addons/google_map/i18n/lt.po
index f1a38450a61..5386908e877 100644
--- a/addons/google_map/i18n/lt.po
+++ b/addons/google_map/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/lv.po b/addons/google_map/i18n/lv.po
index f6bd75d5acb..8483a3d8f51 100644
--- a/addons/google_map/i18n/lv.po
+++ b/addons/google_map/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/nl.po b/addons/google_map/i18n/nl.po
index b02e939843a..744c4348ac0 100644
--- a/addons/google_map/i18n/nl.po
+++ b/addons/google_map/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/nl_BE.po b/addons/google_map/i18n/nl_BE.po
index 446c84c7760..4ca48bd2e90 100644
--- a/addons/google_map/i18n/nl_BE.po
+++ b/addons/google_map/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/pl.po b/addons/google_map/i18n/pl.po
index d80e4819ac5..c6e78ebffa2 100644
--- a/addons/google_map/i18n/pl.po
+++ b/addons/google_map/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/pt.po b/addons/google_map/i18n/pt.po
index c005a724ee8..cd0fb8010f6 100644
--- a/addons/google_map/i18n/pt.po
+++ b/addons/google_map/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/pt_BR.po b/addons/google_map/i18n/pt_BR.po
index 68b6aeb0601..d6c4c33e795 100644
--- a/addons/google_map/i18n/pt_BR.po
+++ b/addons/google_map/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ro.po b/addons/google_map/i18n/ro.po
index eec90cac4b0..c9088fb642e 100644
--- a/addons/google_map/i18n/ro.po
+++ b/addons/google_map/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index ffc4e91bc2f..1543a8f1523 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sk.po b/addons/google_map/i18n/sk.po
index 9ad6033fa77..218b41c4244 100644
--- a/addons/google_map/i18n/sk.po
+++ b/addons/google_map/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sl.po b/addons/google_map/i18n/sl.po
index 61be790cb88..07900685afa 100644
--- a/addons/google_map/i18n/sl.po
+++ b/addons/google_map/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sq.po b/addons/google_map/i18n/sq.po
index 18e9f7cec17..f944d2c975a 100644
--- a/addons/google_map/i18n/sq.po
+++ b/addons/google_map/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/sv.po b/addons/google_map/i18n/sv.po
index 8b3cf032d98..0ca038eff1c 100644
--- a/addons/google_map/i18n/sv.po
+++ b/addons/google_map/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/tlh.po b/addons/google_map/i18n/tlh.po
index c7915b54750..c6bdc61f120 100644
--- a/addons/google_map/i18n/tlh.po
+++ b/addons/google_map/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/tr.po b/addons/google_map/i18n/tr.po
index 30303ca9163..72e1fc351c1 100644
--- a/addons/google_map/i18n/tr.po
+++ b/addons/google_map/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/uk.po b/addons/google_map/i18n/uk.po
index 3f54ac45d41..8bafb6477e5 100644
--- a/addons/google_map/i18n/uk.po
+++ b/addons/google_map/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/zh_CN.po b/addons/google_map/i18n/zh_CN.po
index 06092e55e10..9e7bca9a1c8 100644
--- a/addons/google_map/i18n/zh_CN.po
+++ b/addons/google_map/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/google_map/i18n/zh_TW.po b/addons/google_map/i18n/zh_TW.po
index 33db23435c9..df8847a2b5d 100644
--- a/addons/google_map/i18n/zh_TW.po
+++ b/addons/google_map/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/hr/__terp__.py b/addons/hr/__openerp__.py
similarity index 88%
rename from addons/hr/__terp__.py
rename to addons/hr/__openerp__.py
index 4063b327545..d6477640582 100644
--- a/addons/hr/__terp__.py
+++ b/addons/hr/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,11 +28,9 @@
     "website" : "http://www.openerp.com",
     "description": """
     Module for human resource management. You can manage:
-    * Employees and hierarchies
-    * Work hours sheets
-    * Attendances and sign in/out system
-
-    Different reports are also provided, mainly for attendance statistics.
+    * Employees and hierarchies : You can define your employee with User and display hierarchies
+    * HR Departments
+    * HR Jobs
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
@@ -47,7 +45,7 @@
         'hr_installer.xml',
         'hr_data.xml'
     ],
-    'demo_xml': ['hr_demo.xml', 
+    'demo_xml': ['hr_demo.xml',
         'hr_department_demo.xml'],
     'installable': True,
     'active': False,
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index d2b4d2ec011..bdaca6e2ace 100755
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -18,7 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 from osv import fields, osv
 from tools.translate import _
 
@@ -82,6 +81,7 @@ class hr_job(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c),
         'state': lambda *args: 'open'
     }
+
 hr_job()
 
 class hr_employee(osv.osv):
@@ -104,7 +104,6 @@ class hr_employee(osv.osv):
         'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone', readonly=True),
         'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail', readonly=True),
         'work_location': fields.char('Office Location', size=32),
-
         'notes': fields.text('Notes'),
         'parent_id': fields.many2one('hr.employee', 'Manager', select=True),
         'category_id' : fields.many2one('hr.employee.category', 'Category'),
@@ -112,7 +111,6 @@ class hr_employee(osv.osv):
         'resource_id': fields.many2one('resource.resource','Resource',ondelete='cascade'),
         'coach_id':fields.many2one('res.users','Coach'),
         'job_id':fields.many2one('hr.job', 'Job'),
-
     }
     _defaults = {
         'active' : lambda *a: True,
@@ -134,5 +132,4 @@ class hr_employee(osv.osv):
 
 hr_employee()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
index c7ea68f1dc3..bc1649bbef5 100644
--- a/addons/hr/hr_department_demo.xml
+++ b/addons/hr/hr_department_demo.xml
@@ -1,63 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        
+
         <record id="dep_management" model="hr.department">
             <field name="name">Management</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="manager_id" ref="base.user_root"/>
         </record>
+
         <record id="dep_administration" model="hr.department">
             <field name="name">Administration</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="manager_id" ref="base.user_root"/>
         </record>
-        
+
         <record id="dep_technical" model="hr.department">
             <field name="name">Technical department</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="manager_id" ref="base.user_root"/>
         </record>
-        
+
         <record id="dep_it" model="hr.department">
             <field name="name">IT</field>
             <field name="parent_id" ref="dep_technical"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="manager_id" ref="base.user_root"/>
         </record>
-        
+
         <record id="dep_marketing" model="hr.department">
             <field name="name">Marketing</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="manager_id" ref="base.user_root"/>
         </record>
-        
+
         <record id="dep_sales" model="hr.department">
             <field name="name">Sales</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="manager_id" ref="base.user_root"/>
             <field name="parent_id" ref="dep_management"/>
         </record>
-        
+
         <record id="dep_sales_europe" model="hr.department">
             <field name="name">Sales Europe</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="manager_id" ref="base.user_root"/>
             <field name="parent_id" ref="dep_sales"/>
         </record>
-        
+
         <record id="dep_sales_america" model="hr.department">
             <field name="name">Sales America</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="manager_id" ref="base.user_root"/>
             <field name="parent_id" ref="dep_sales"/>
         </record>
-        
-        
-        
-        
+
     </data>
 </openerp>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 1ae7295f25d..a66951e9f45 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -15,7 +15,7 @@
                 <form string="department">
                     <group col="6" colspan="4">
                         <field colspan="4" name="name" select="1"/>
-                        <field name="parent_id" select="2"/>
+                        <field name="parent_id"/>
                         <field colspan="4" name="manager_id" select="1"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                     </group>
@@ -44,17 +44,17 @@
             </field>
         </record>
          <record id="view_department_filter" model="ir.ui.view">
-	        <field name="name">Departments</field>
-	        <field name="model">hr.department</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Departments">
-	            	<group col='4' colspan='2'>
-	            		<field name="name" />
-	            		<field name="manager_id" widget="selection"/>
-	            	</group>
-	            </search>
-	         </field>
+            <field name="name">Departments</field>
+            <field name="model">hr.department</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Departments">
+                    <group col='4' colspan='2'>
+                        <field name="name" />
+                        <field name="manager_id" widget="selection"/>
+                    </group>
+                </search>
+             </field>
          </record>
         <record id="open_module_tree_department_tree" model="ir.actions.act_window">
             <field name="name">Departments</field>
@@ -75,14 +75,14 @@
        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
        <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/>
 
-		<record model="ir.ui.view" id="view_users_form_inherit">
+        <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
             <field name="type">form</field>
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Departements Informations">
+                    <page string="Departements Informations" groups="base.group_extended">
                         <field name="context_department_id" completion="1" widget="selection" string="Department"/>
                         <separator string="Managers" colspan="4"/>
                         <field name="parent_id" nolabel="1" colspan="4"/>
@@ -92,7 +92,7 @@
                 </notebook>
             </field>
         </record>
-		<record model="ir.ui.view" id="view_department_form_simple_modif_inherited1">
+        <record model="ir.ui.view" id="view_department_form_simple_modif_inherited1">
             <field name="name">view.department.form.hr.inherited1</field>
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form_simple_modif" />
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 69ce433e0af..5125052c499 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -3,22 +3,13 @@
     <data>
         <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
         <menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
-      <!--  <menuitem
-            id="menu_hr_reporting"
-            name="Reporting"
-            parent="hr.menu_hr_root"
-            sequence="40" /> -->
         <menuitem
             id="menu_hr_configuration"
             name="Configuration"
             parent="hr.menu_hr_root"
             sequence="50" />
-<!--   <menuitem
-            id="menu_hr_time"
-            name="Time Tracking"
-            parent="hr.menu_hr_root"/>
- -->
       <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_configuration" name="Employees" sequence="1"/>
+
         <!--
         ==========
         Employee
@@ -33,7 +24,7 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
                         <field name="user_id"/>
-                        <field name="active"/>
+                        <field name="active" groups="base.group_extended"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4">
@@ -52,7 +43,7 @@
                                 <separator colspan="2" string="Social IDs"/>
                                 <field name="ssnid"/>
                                 <field name="sinid" groups="base.group_extended"/>
-                                <field name="otherid"/>
+                                <field name="otherid" groups="base.group_extended"/>
                             </group>
 
                             <group col="2" colspan="2">
@@ -102,16 +93,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-partner" domain="[('parent_id','child_of',uid),('id', '!=', uid)]" string ="My Employees"/>
+                    <filter icon="terp-partner" domain="[('active','=',False)]" string="Unactive"
+                        groups="base.group_extended"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
                     <field name="parent_id" widget="selection" />
                     <newline />
-
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
                         <filter string="Job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
                     </group>
@@ -136,17 +129,6 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
-      <!--  <menuitem
-            id="menu_open_view_employee_list"
-            name="Employees"
-            action="open_view_employee_list"
-            groups="group_hr_manager"
-            parent="menu_hr_human_resources"/>
-        <menuitem
-            action="open_view_employee_tree"
-            id="menu_open_view_employee_tree"
-            parent="menu_open_view_employee_list"/>-->
-
        <record id="open_view_employee_list_my" model="ir.actions.act_window">
             <field name="name">Employees</field>
             <field name="res_model">hr.employee</field>
@@ -156,12 +138,7 @@
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
-        <!--<menuitem
-            action="open_view_employee_list_my"
-            id="menu_open_view_employee_list_my"
-            parent="menu_open_view_employee_list"/>-->
         <menuitem
-            name="Employees"
             action="open_view_employee_list_my"
             id="menu_open_view_employee_list_my"
             parent="menu_hr_human_resources"/>
@@ -191,9 +168,9 @@
         </record>
 
         <menuitem
-                action="action_hr_marital_status"
-                id="hr_menu_marital_status"
-                parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
+            action="action_hr_marital_status"
+            id="hr_menu_marital_status"
+            parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
 
         <!--
         =======================
@@ -280,7 +257,9 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="open_view_categ_form" id="menu_view_employee_category_form" parent="menu_view_employee_category_configuration_form" sequence="1"/>
+        <menuitem action="open_view_categ_form" 
+            id="menu_view_employee_category_form" 
+            parent="menu_view_employee_category_configuration_form" sequence="1"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -308,7 +287,10 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem action="open_view_categ_tree" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
+        <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">
             <field name="name">hr.job.form</field>
@@ -393,7 +375,10 @@
             name="Recruitment"
             id="base.menu_crm_case_job_req_main"
             parent="menu_hr_root"/>
-        <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
+        <menuitem 
+            parent="base.menu_crm_case_job_req_main" 
+            id="menu_hr_job" 
+            action="action_hr_job" sequence="2"/>
 
     </data>
 </openerp>
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index 8bb129df0a7..28004486e04 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index a6932ded95f..467372b8b33 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index e4119940e82..19168aeb450 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index 55ecc67b99f..c176bb2be6a 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index e7ab23dd03e..a1a5813f58c 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index faa11134d9b..88ea95d0f9d 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index 4f11bbcd95f..71449585da7 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index 677a441e494..9cef1c9bac9 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index e71c90e4167..fb98633c89e 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 9eaebe60d3e..7e8824b5373 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index 6f360e59b70..038ea99ffb2 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index 401ffba0ad1..12f8cb71f1d 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index c9488896f87..4d7f91138ce 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index 2f796406e8b..1aeac3d2282 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 8bb129df0a7..28004486e04 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index 964e58f1aeb..2d204c97c33 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index 8346eeb20c9..661b70216a4 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 251c184d6aa..831501bd962 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-03-28 10:20+0000\n"
-"Last-Translator: aiedail92 <aiedail92@gmail.com>\n"
+"Last-Translator: Luca Mattiello <aiedail92@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-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index fede2d3c76e..85e36a286c8 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.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: 2009-09-08 13:55+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-04-15 00:59+0000\n"
+"Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -58,7 +58,7 @@ msgstr "페어런트"
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "액션 정의에 잘못된 모델 이름이 있습니다."
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 7a47f3ff377..9dfcf15e16c 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index 06af739b28d..94e441b3b9a 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 8c1e8ea9ff3..742901d3903 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index 74fe68ee167..653229ddff4 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index 84d1f63da08..2fd27f35df1 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index c3c77c88461..e487d47d469 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+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 2e1e8860e87..72290e7af56 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index 538a304c858..83bf9ba3341 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 880cdcb9dce..8c5c69256d1 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-10 14:44+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2010-04-13 07:40+0000\n"
+"Last-Translator: grisha <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-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -36,7 +36,7 @@ msgstr "Ошибка! Невозможно создать рекурсивные
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "Карта социальной защиты(ИНН)"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -57,7 +57,7 @@ msgstr ""
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: hr
 #: view:hr.department:0
@@ -67,7 +67,7 @@ msgstr "Отдел"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Contact  of employee"
-msgstr ""
+msgstr "Контакты сотрудника"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -93,7 +93,7 @@ msgstr "Пятница"
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr ""
+msgstr "Вышестоящее подразделение"
 
 #. module: hr
 #: view:hr.department:0
@@ -110,7 +110,7 @@ msgstr "Работа с"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr ""
+msgstr "Структура подчинения (сотрудников)"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
@@ -141,7 +141,7 @@ msgstr "Структура сотрудников"
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr ""
+msgstr "Страховое удостоверение"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -189,12 +189,12 @@ msgstr "Участники"
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr ""
+msgstr "Карта социальной защиты (ИНН)"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
 msgid "Fill up contact information"
-msgstr ""
+msgstr "Заполните контактную информацию"
 
 #. module: hr
 #: constraint:ir.ui.view:0
@@ -222,7 +222,7 @@ msgstr "Отделы"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr ""
+msgstr "Контакты сотрудника"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -242,7 +242,7 @@ msgstr "Мужской"
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
 msgid "Create openerp user"
-msgstr ""
+msgstr "Создать пользователя OpenERP"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -305,7 +305,7 @@ msgstr "День недели"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Birthday"
-msgstr ""
+msgstr "Дата рождения"
 
 #. module: hr
 #: field:hr.employee,active:0
@@ -325,7 +325,7 @@ msgstr ""
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Create OpenERP User"
-msgstr ""
+msgstr "Создать пользователя OpenERP"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
@@ -361,7 +361,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr ""
+msgstr "Рабочий адрес"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -416,7 +416,7 @@ msgstr "Категории сотрудников"
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr ""
+msgstr "Домашний адрес"
 
 #. module: hr
 #: view:hr.department:0
@@ -458,7 +458,7 @@ msgstr "Название отдела"
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr ""
+msgstr "Подчиненные подразделения"
 
 #. module: hr
 #: view:hr.employee:0
@@ -468,7 +468,7 @@ msgstr ""
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Fill up employee's contact information"
-msgstr ""
+msgstr "Заполните контактную информацию о сотруднике"
 
 #. module: hr
 #: field:hr.department,manager_id:0
@@ -480,7 +480,7 @@ msgstr "Менеджер"
 #: model:ir.actions.act_window,name:hr.open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 msgid "All Employees"
-msgstr ""
+msgstr "Все сотрудники"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index e5a9f22c186..38a78f40518 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index 33caed51415..12670e124c0 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index ee3632d1fe4..522af3574da 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index f7e62658b55..e3acd524000 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 9a7e969937f..1e56f220dce 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index dc435056d31..ffb39cd884e 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+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 fb73c9afa54..5e4be7c5558 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index 275ce30056c..34a0db3743f 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+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 c7b0c8751bc..f47f296e984 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index 2f8fc4626bf..c35781aa931 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index ab3e46c9bbf..bc3dd7d0b71 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -52,4 +52,7 @@ class hr_installer(osv.osv_memory):
         'hr_holidays': True,
         'hr_expense': True,
         }
+
 hr_installer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_attendance/__terp__.py b/addons/hr_attendance/__openerp__.py
similarity index 87%
rename from addons/hr_attendance/__terp__.py
rename to addons/hr_attendance/__openerp__.py
index 7ea1b0b33ff..c59ba3dcbdb 100644
--- a/addons/hr_attendance/__terp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -37,7 +37,11 @@
         'hr_attendance_view.xml',
         'hr_attendance_wizard.xml',
         'hr_attendance_report.xml',
-        'security/ir.model.access.csv'
+        'security/ir.model.access.csv',
+        'wizard/hr_attendance_bymonth_view.xml',
+        'wizard/hr_attendance_byweek_view.xml',
+        'wizard/hr_attendance_error_view.xml',
+        'wizard/hr_attendance_sign_in_out_view.xml',
     ],
     'demo_xml': ['hr_attendance_demo.xml'],
     'installable': True,
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index cca69186f0c..27458ac2e85 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -37,7 +37,7 @@ class hr_action_reason(osv.osv):
     }
 hr_action_reason()
 
-def _employee_get(obj,cr,uid,context={}):
+def _employee_get(obj, cr, uid, context=None):
     ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
     if ids:
         return ids[0]
@@ -90,7 +90,7 @@ class hr_employee(osv.osv):
     _inherit = "hr.employee"
     _description = "Employee"
 
-    def _state(self, cr, uid, ids, name, args, context={}):
+    def _state(self, cr, uid, ids, name, args, context=None):
         result = {}
         for id in ids:
             result[id] = 'absent'
@@ -125,27 +125,27 @@ class hr_employee(osv.osv):
         #Special case when button calls this method :type=context
         if isinstance(type,dict):
             type = type.get('type','action')
-            
+
         if type == 'sign_in':
             warning_sign = "Sign In"
         elif type == 'sign_out':
-            warning_sign = "Sign Out"    
-        
+            warning_sign = "Sign Out"
+
         for emp in self.read(cr, uid, ids, ['id'], context=context):
             if not self._action_check(cr, uid, emp['id'], dt, context):
                 raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
-            
+
             res = {'action' : type, 'employee_id' : emp['id']}
 
             if dt:
                 res['name'] = dt
-                
+
             id = self.pool.get('hr.attendance').create(cr, uid, res, context=context)
-        
+
         if type != 'action':
             return id
         return True
-    
+
 hr_employee()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index a1ea01ea764..717495b654e 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -2,22 +2,22 @@
 <openerp>
     <data>
 
- 		<wizard 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 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"/>
+		<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"/>
+      <!--  <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 Management" sequence="1"/>
          <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"/>
-
+        <!--<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_attendance/i18n/ar.po b/addons/hr_attendance/i18n/ar.po
index b585bfb237e..3481ac33ef0 100644
--- a/addons/hr_attendance/i18n/ar.po
+++ b/addons/hr_attendance/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/bg.po b/addons/hr_attendance/i18n/bg.po
index 6a5862ffbdc..db878d513cc 100644
--- a/addons/hr_attendance/i18n/bg.po
+++ b/addons/hr_attendance/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/bs.po b/addons/hr_attendance/i18n/bs.po
index 8e64a7a186a..240a77a3cff 100644
--- a/addons/hr_attendance/i18n/bs.po
+++ b/addons/hr_attendance/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/ca.po b/addons/hr_attendance/i18n/ca.po
index 5108ee49b3c..39a3ac8ead8 100644
--- a/addons/hr_attendance/i18n/ca.po
+++ b/addons/hr_attendance/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/cs.po b/addons/hr_attendance/i18n/cs.po
index 857729d0361..bd334db1dc6 100644
--- a/addons/hr_attendance/i18n/cs.po
+++ b/addons/hr_attendance/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index 9436f512441..c761ec043dc 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/el.po b/addons/hr_attendance/i18n/el.po
index 1a6b8ab4c6b..e6544aa5585 100644
--- a/addons/hr_attendance/i18n/el.po
+++ b/addons/hr_attendance/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index 12755e45b0a..8698454fd2f 100644
--- a/addons/hr_attendance/i18n/es.po
+++ b/addons/hr_attendance/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/es_AR.po b/addons/hr_attendance/i18n/es_AR.po
index 254c61e4acb..2b7100b8d0c 100644
--- a/addons/hr_attendance/i18n/es_AR.po
+++ b/addons/hr_attendance/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/et.po b/addons/hr_attendance/i18n/et.po
index 84a500e442b..1c93e06cd27 100644
--- a/addons/hr_attendance/i18n/et.po
+++ b/addons/hr_attendance/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index 80b3ddab3ce..6d8e49c7bf1 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/fr.po b/addons/hr_attendance/i18n/fr.po
index 4a3cc34645e..5b047e628b9 100644
--- a/addons/hr_attendance/i18n/fr.po
+++ b/addons/hr_attendance/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/hr.po b/addons/hr_attendance/i18n/hr.po
index e6784070602..9544f047e91 100644
--- a/addons/hr_attendance/i18n/hr.po
+++ b/addons/hr_attendance/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/hu.po b/addons/hr_attendance/i18n/hu.po
index b585bfb237e..3481ac33ef0 100644
--- a/addons/hr_attendance/i18n/hu.po
+++ b/addons/hr_attendance/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/id.po b/addons/hr_attendance/i18n/id.po
index ec42558e9bf..537ace679d8 100644
--- a/addons/hr_attendance/i18n/id.po
+++ b/addons/hr_attendance/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+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 271a1a95cc5..56a3e5fce5c 100644
--- a/addons/hr_attendance/i18n/it.po
+++ b/addons/hr_attendance/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/ko.po b/addons/hr_attendance/i18n/ko.po
index 1c0fbac4416..3b713299b67 100644
--- a/addons/hr_attendance/i18n/ko.po
+++ b/addons/hr_attendance/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/lt.po b/addons/hr_attendance/i18n/lt.po
index b585bfb237e..3481ac33ef0 100644
--- a/addons/hr_attendance/i18n/lt.po
+++ b/addons/hr_attendance/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/lv.po b/addons/hr_attendance/i18n/lv.po
index 6fde1451f3d..f0a11490cf1 100644
--- a/addons/hr_attendance/i18n/lv.po
+++ b/addons/hr_attendance/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/nl.po b/addons/hr_attendance/i18n/nl.po
index 8de3170f9f3..86e57dd1e3b 100644
--- a/addons/hr_attendance/i18n/nl.po
+++ b/addons/hr_attendance/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/nl_BE.po b/addons/hr_attendance/i18n/nl_BE.po
index c96a9c33171..b6eeb8a857f 100644
--- a/addons/hr_attendance/i18n/nl_BE.po
+++ b/addons/hr_attendance/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/pl.po b/addons/hr_attendance/i18n/pl.po
index 9431661a07b..70e11c4a599 100644
--- a/addons/hr_attendance/i18n/pl.po
+++ b/addons/hr_attendance/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/pt.po b/addons/hr_attendance/i18n/pt.po
index 869af20d190..847a3a5fdc5 100644
--- a/addons/hr_attendance/i18n/pt.po
+++ b/addons/hr_attendance/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+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 67aede9a5af..6b3e73814cd 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/ro.po b/addons/hr_attendance/i18n/ro.po
index 797bdb30b12..717a873ab55 100644
--- a/addons/hr_attendance/i18n/ro.po
+++ b/addons/hr_attendance/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/ru.po b/addons/hr_attendance/i18n/ru.po
index cccdc5df8ae..581d4002600 100644
--- a/addons/hr_attendance/i18n/ru.po
+++ b/addons/hr_attendance/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/sl.po b/addons/hr_attendance/i18n/sl.po
index 2dedfb2a1aa..a7320a6a2ed 100644
--- a/addons/hr_attendance/i18n/sl.po
+++ b/addons/hr_attendance/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/sv.po b/addons/hr_attendance/i18n/sv.po
index 368288b27da..6876a86a633 100644
--- a/addons/hr_attendance/i18n/sv.po
+++ b/addons/hr_attendance/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/tlh.po b/addons/hr_attendance/i18n/tlh.po
index 4096b572fe7..e2e8451e98e 100644
--- a/addons/hr_attendance/i18n/tlh.po
+++ b/addons/hr_attendance/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+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 4d8b9ac5a19..c29b97853ca 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/uk.po b/addons/hr_attendance/i18n/uk.po
index 43a8885bdcb..458a99f308e 100644
--- a/addons/hr_attendance/i18n/uk.po
+++ b/addons/hr_attendance/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index 930490925e8..5f33ead7c6a 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/zh_TW.po b/addons/hr_attendance/i18n/zh_TW.po
index b521cfbbdd3..bc5fa40fd2d 100644
--- a/addons/hr_attendance/i18n/zh_TW.po
+++ b/addons/hr_attendance/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/wizard/__init__.py b/addons/hr_attendance/wizard/__init__.py
index a216c879285..a414c9a8798 100644
--- a/addons/hr_attendance/wizard/__init__.py
+++ b/addons/hr_attendance/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,13 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import sign_in_out
-import print_attendance_error
-from print_byweek import wiz_byweek
-from print_bymonth import wiz_bymonth
+import hr_attendance_sign_in_out
+import hr_attendance_error
+import hr_attendance_byweek
+import hr_attendance_bymonth
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth.py b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
new file mode 100644
index 00000000000..2b2c33cf5eb
--- /dev/null
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import osv, fields
+
+class hr_attendance_bymonth(osv.osv_memory):
+    _name = 'hr.attendance.month'
+    _description = 'Print Monthly Attendance Report'
+    _columns = {
+        'month': fields.selection([(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')],
+                                  'Month', required=True),
+        'year': fields.integer('Year', required=True)
+                }
+    _defaults = {
+         'month': lambda * a: time.gmtime()[1],
+         'year': lambda * a: time.gmtime()[0],
+             }
+
+    def print_report(self, cr, uid, ids, context=None):
+        datas = {
+             'ids': [],
+             'model': 'hr.employee',
+             'form': self.read(cr, uid, ids)[0]
+                 }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'hr.attendance.bymonth',
+            'datas': datas,
+            }
+
+hr_attendance_bymonth()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
new file mode 100644
index 00000000000..89272706eee
--- /dev/null
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="view_hr_attendance_month" model="ir.ui.view">
+            <field name="name">Attendance Report Monthly</field>
+            <field name="model">hr.attendance.month</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Print Attendance Report Monthly">
+			    <group col="4" colspan="6">
+				    <field name="month"/>
+				    <field name="year"/>
+				    <newline/>
+				</group>
+				<separator colspan="4"/>
+			    <group col="2" colspan="4">
+            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+				</group>
+			</form>
+            </field>
+        </record>
+
+        <record id="action_hr_attendance_month" model="ir.actions.act_window">
+            <field name="name">Print Timesheet by month</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.attendance.month</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+		<record model="ir.values" id="hr_attendance_month_values">
+            <field name="model_id" ref="hr.model_hr_employee" />
+            <field name="object" eval="1" />
+            <field name="name">Print Timesheet by month</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_month'))" />
+            <field name="key">action</field>
+            <field name="model">hr.employee</field>
+        </record>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
new file mode 100644
index 00000000000..30c63d69f2b
--- /dev/null
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import osv, fields
+
+class hr_attendance_byweek(osv.osv_memory):
+    _name = 'hr.attendance.week'
+    _description = 'Print Week Attendance Report'
+    _columns = {
+        'init_date': fields.date('Starting Date', required=True),
+        'end_date': fields.date('Ending Date', required=True)
+                }
+    _defaults = {
+         'init_date': lambda *a: time.strftime('%Y-%m-%d'),
+         'end_date': lambda *a: time.strftime('%Y-%m-%d'),
+             }
+
+    def print_report(self, cr, uid, ids, context=None):
+        datas = {
+             'ids': [],
+             'model': 'hr.employee',
+             'form': self.read(cr, uid, ids)[0]
+                 }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'hr.attendance.allweeks',
+            'datas': datas,
+            }
+hr_attendance_byweek()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
new file mode 100644
index 00000000000..618217a1a66
--- /dev/null
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="view_hr_attendance_week" model="ir.ui.view">
+            <field name="name">Attendance Report Week</field>
+            <field name="model">hr.attendance.week</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Print Attendance Report Weekly">
+			    <group col="4" colspan="6">
+			    	<separator string="Select a starting and a end date" colspan="4"/>
+				    <field name="init_date"/>
+				    <field name="end_date"/>
+				    <newline/>
+				</group>
+				<separator colspan="4"/>
+			    <group col="2" colspan="4">
+            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+				</group>
+			</form>
+            </field>
+        </record>
+
+        <record id="action_hr_attendance_week" model="ir.actions.act_window">
+            <field name="name">Print Timesheet by week</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.attendance.week</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+		<record model="ir.values" id="hr_attendance_week_values">
+            <field name="model_id" ref="hr.model_hr_employee" />
+            <field name="object" eval="1" />
+            <field name="name">Print Timesheet by week</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_week'))" />
+            <field name="key">action</field>
+            <field name="model">hr.employee</field>
+        </record>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
new file mode 100644
index 00000000000..c14ddcd9032
--- /dev/null
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import osv, fields
+from tools.translate import _
+
+class hr_attendance_error(osv.osv_memory):
+
+    _name = 'hr.attendance.error'
+    _description = 'Print Error Attendance Report'
+    _columns = {
+        'init_date': fields.date('Starting Date', required=True),
+        'end_date': fields.date('Ending Date', required=True),
+        'max_delay': fields.integer('Max. Delay (Min)', required=True)
+
+                }
+    _defaults = {
+         'init_date': lambda *a: time.strftime('%Y-%m-%d'),
+         'end_date': lambda *a: time.strftime('%Y-%m-%d'),
+         'max_delay': 120,
+             }
+
+    def print_report(self, cr, uid, ids, context=None):
+        emp_ids = []
+        data_error = self.read(cr, uid, ids)[0]
+        date_from = data_error['init_date']
+        date_to = data_error['end_date']
+        cr.execute("select id from hr_attendance where employee_id =ANY(%s) and to_char(name,'YYYY-mm-dd')<=%s and to_char(name,'YYYY-mm-dd')>=%s and action =ANY(%s) order by name" ,(context['active_ids'], date_to, date_from, ['sign_in','sign_out']))
+        attendance_ids = [x[0] for x in cr.fetchall()]
+        if not attendance_ids:
+            raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
+        attendance_records = self.pool.get('hr.attendance').browse(cr, uid, attendance_ids)
+
+        for rec in attendance_records:
+            if rec.employee_id.id not in emp_ids:
+                emp_ids.append(rec.employee_id.id)
+        data_error['emp_ids'] = emp_ids
+        datas = {
+             'ids': [],
+             'model': 'hr.employee',
+             'form': data_error
+                 }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'hr.attendance.error',
+            'datas': datas,
+            }
+
+hr_attendance_error()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
new file mode 100644
index 00000000000..16769f66df0
--- /dev/null
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="view_hr_attendance_error" model="ir.ui.view">
+            <field name="name">Attendance Report Error</field>
+            <field name="model">hr.attendance.error</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Print Attendance Report Error">
+			    <group col="4" colspan="6">
+			    	<separator string="Analysis Information" colspan="4"/>
+				    <field name="init_date"/>
+				    <field name="end_date"/>
+				    <field name="max_delay"/>
+				    <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
+				    <newline/>
+				</group>
+				<separator colspan="4"/>
+			    <group col="2" colspan="4">
+            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+				</group>
+			</form>
+            </field>
+        </record>
+
+        <record id="action_hr_attendance_error" model="ir.actions.act_window">
+            <field name="name">Print Attendance Error Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.attendance.error</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+		<record model="ir.values" id="hr_attendance_error_values">
+            <field name="model_id" ref="hr.model_hr_employee" />
+            <field name="object" eval="1" />
+            <field name="name">Print Attendance Error Report</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_error'))" />
+            <field name="key">action</field>
+            <field name="model">hr.employee</field>
+        </record>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
new file mode 100644
index 00000000000..9ad27298159
--- /dev/null
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -0,0 +1,185 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+import netsvc
+from osv import osv, fields
+from tools.translate import _
+
+class hr_si_so_ask(osv.osv_memory):
+    _name = 'hr.sign.in.out.ask'
+    _description = 'Ask for Sign In Out'
+    _columns = {
+        'name': fields.char('Employees name', size=32, required=True, readonly=True),
+        'last_time': fields.datetime('Your last sign out', required=True),
+        'emp_id': fields.char('Empoyee ID', size=32, required=True, readonly=True),
+                }
+    def _get_empname(self, cr, uid, context=None):
+        service = netsvc.LocalService('object_proxy')
+        emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
+        if emp_id:
+            employee = service.execute(cr.dbname, uid, 'hr.employee', 'read', emp_id)[0]
+            return employee['name']
+        return ''
+
+    def _get_empid(self, cr, uid, context=None):
+        service = netsvc.LocalService('object_proxy')
+        emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
+        if emp_id:
+            return emp_id[0]
+        return False
+
+    _defaults = {
+         'name': _get_empname,
+         'emp_id': _get_empid,
+                 }
+
+    def sign_in(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, [])[0]
+        return self.pool.get('hr.sign.in.out').sign_in(cr, uid, data, context)
+
+    def sign_out(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, [])[0]
+        return self.pool.get('hr.sign.in.out').sign_out(cr, uid, data, context)
+
+hr_si_so_ask()
+
+class hr_sign_in_out(osv.osv_memory):
+
+    _name = 'hr.sign.in.out'
+    _description = 'Sign In Sign Out'
+
+    _columns = {
+        'name': fields.char('Employees name', size=32, required=True, readonly=True),
+        'state': fields.char('Current state', size=32, required=True, readonly=True),
+        'emp_id': fields.char('Empoyee ID', size=32, required=True, readonly=True),
+                }
+
+    def _get_empid(self, cr, uid, context=None):
+        service = netsvc.LocalService('object_proxy')
+        emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
+        if emp_id:
+            employee = service.execute(cr.dbname, uid, 'hr.employee', 'read', emp_id)[0]
+            return {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]}
+        return {}
+
+    def default_get(self, cr, uid, fields_list, context=None):
+        res = super(hr_sign_in_out, self).default_get(cr, uid, fields_list, context=context)
+        res_emp = self._get_empid(cr, uid, context=context)
+        res.update(res_emp)
+        return res
+
+    def si_check(self, cr, uid, ids, context=None):
+        service = netsvc.LocalService('object_proxy')
+        obj_model = self.pool.get('ir.model.data')
+        data = self.read(cr, uid, ids, [])[0]
+        emp_id = data['emp_id']
+        att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id)], limit=1, order='name desc')
+        last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
+        if last_att:
+            last_att = last_att[0]
+        cond = not last_att or last_att['action'] == 'sign_out'
+        if cond:
+            return self.sign_in(cr, uid, data, context)
+        else:
+            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_attendance_so_ask')], context=context)
+            resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            return {
+                'name': _('Sign in / Sign out'),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'hr.sign.in.out.ask',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }
+
+    def so_check(self, cr, uid, ids, context=None):
+        service = netsvc.LocalService('object_proxy')
+        obj_model = self.pool.get('ir.model.data')
+        data = self.read(cr, uid, ids, [])[0]
+        emp_id = data['emp_id']
+        att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id),('action','!=','action')], limit=1, order='name desc')
+        last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
+        if last_att:
+            last_att = last_att[0]
+        if not att_id and not last_att:
+            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_attendance_message')], context=context)
+            resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            return {
+                'name': _('Sign in / Sign out'),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'hr.sign.in.out',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }
+
+        cond = last_att and last_att['action'] == 'sign_in'
+        if cond:
+            return self.sign_out(cr, uid, data, context)
+        else:
+            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_attendance_si_ask')], context=context)
+            resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            return {
+                'name': _('Sign in / Sign out'),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'hr.sign.in.out.ask',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }
+
+    def sign_in(self, cr, uid, data, context=None):
+        service = netsvc.LocalService('object_proxy')
+        emp_id = data['emp_id']
+        if 'last_time' in data:
+            if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
+                raise osv.except_osv(_('UserError'), _('The sign-out date must be in the past'))
+            service.execute(cr.dbname, uid, 'hr.attendance', 'create', {
+                'name': data['last_time'],
+                'action': 'sign_out',
+                'employee_id': emp_id
+            })
+        try:
+            success = service.execute(cr.dbname, uid, 'hr.employee', 'attendance_action_change', [emp_id], 'sign_in')
+        except:
+            raise osv.except_osv(_('UserError'), _('A sign-in must be right after a sign-out !'))
+        return {} # To do: Return Success message
+
+    def sign_out(self, cr, uid, data, context=None):
+        service = netsvc.LocalService('object_proxy')
+        emp_id = data['emp_id']
+        if 'last_time' in data:
+            if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
+                raise osv.except_osv(_('UserError'), _('The Sign-in date must be in the past'))
+            service.execute(cr.dbname, uid, 'hr.attendance', 'create', {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id})
+        try:
+            success = service.execute(cr.dbname, uid, 'hr.employee', 'attendance_action_change', [emp_id], 'sign_out')
+        except:
+            raise osv.except_osv(_('UserError'), _('A sign-out must be right after a sign-in !'))
+        return {} # To do: Return Success message
+
+hr_sign_in_out()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
new file mode 100644
index 00000000000..62cffa720a9
--- /dev/null
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_hr_attendance_sigh_in_out" model="ir.ui.view">
+            <field name="name">hr.sign.in.out.form</field>
+            <field name="model">hr.sign.in.out</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sign in / Sign out">
+                	<group colspan="4" >
+	                	<separator string="You are now ready to sign in or out of the attendance follow up" colspan="4" />
+	                	<field name="name" />
+	                	<field name="state" />
+                	</group>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-go-back" string="Sign in" name="si_check" type="object"/>
+                    	<button icon="gtk-go-forward" string="Sign out" name="so_check" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+       <record id="view_hr_attendance_message" model="ir.ui.view">
+            <field name="name">hr.sign.in.out.form</field>
+            <field name="model">hr.sign.in.out</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sign in / Sign out">
+                	<label string="Sign-Out Entry must follow Sign-In." colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Ok"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_hr_attendance_sigh_in_out" model="ir.actions.act_window">
+            <field name="name">Sign in / Sign out</field>
+            <field name="res_model">hr.sign.in.out</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_hr_attendance_sigh_in_out"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_hr_attendance_sigh_in_out"
+        	id="menu_hr_attendance_sigh_in_out"
+        	parent="menu_hr_time_tracking" groups="group_hr_attendance" />
+
+       <record id="view_hr_attendance_so_ask" model="ir.ui.view">
+            <field name="name">hr.sign.in.out.ask.form</field>
+            <field name="model">hr.sign.in.out.ask</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="hr.sign.out.ask">
+                	<group colspan="4" >
+	                	<separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
+	                	<field name="name" />
+	                	<field name="last_time" string="Your last sign out" />
+                	</group>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-go-back" string="Sign in" name="sign_in" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+       <record id="view_hr_attendance_si_ask" model="ir.ui.view">
+            <field name="name">hr.sign.in.out.ask.form</field>
+            <field name="model">hr.sign.in.out.ask</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="hr.sign.in.out.ask">
+                	<group colspan="4" >
+	                	<separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
+	                	<field name="name" />
+	                	<field name="last_time" string="Your last sign in" />
+                	</group>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-go-back" string="Sign out" name="sign_out" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+
+    </data>
+</openerp>
diff --git a/addons/hr_attendance/wizard/print_attendance_error.py b/addons/hr_attendance/wizard/print_attendance_error.py
deleted file mode 100644
index c7c9ab18068..00000000000
--- a/addons/hr_attendance/wizard/print_attendance_error.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import time
-import pooler
-from tools.translate import _
-
-_date_form = '''<?xml version="1.0"?>
-<form string="Attendance Report">
-    <separator string="Analysis Information" colspan="4"/>
-    <field name="init_date"/>
-    <field name="end_date"/>
-    <field name="max_delay"/>
-    <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
-</form>'''
-
-_date_fields = {
-    'init_date': {'string':'Starting Date', 'type':'date', 'default':lambda *a: time.strftime('%Y-%m-%d'), 'required':True},
-    'end_date': {'string':'Ending Date', 'type':'date', 'default':lambda *a: time.strftime('%Y-%m-%d'), 'required':True},
-    'max_delay': {'string':'Max. Delay (Min)', 'type':'integer', 'default':lambda *a: 120, 'required':True},
-}
-
-def _check_data(self, cr, uid, data, *args):
-    date_from = data['form']['init_date']
-    date_to = data['form']['end_date']
-    cr.execute("select id from hr_attendance where employee_id =ANY(%s) and to_char(name,'YYYY-mm-dd')<=%s and to_char(name,'YYYY-mm-dd')>=%s and action =ANY(%s) order by name" ,(data['ids'], date_to, date_from, ['sign_in','sign_out']))
-    attendance_ids = [x[0] for x in cr.fetchall()]
-    if not attendance_ids:
-        raise wizard.except_wizard(_('No Data Available'), _('No records found for your selection!'))
-
-    attendance_records = pooler.get_pool(cr.dbname).get('hr.attendance').browse(cr,uid,attendance_ids)
-    emp_ids = []
-    for rec in attendance_records:
-        if rec.employee_id.id not in emp_ids:
-            emp_ids.append(rec.employee_id.id)
-
-    data['form']['emp_ids'] = emp_ids
-
-    return data['form']
-
-
-class wiz_attendance(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('end','Cancel', 'gtk-cancel'),('print','Print', 'gtk-ok') ]}
-        },
-        'print': {
-            'actions': [_check_data],
-            'result': {'type': 'print', 'report': 'hr.attendance.error', 'state':'end'}
-        }
-    }
-wiz_attendance('hr.attendance.report')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_attendance/wizard/print_bymonth.py b/addons/hr_attendance/wizard/print_bymonth.py
deleted file mode 100644
index ae2d5df937b..00000000000
--- a/addons/hr_attendance/wizard/print_bymonth.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-###############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import time
-
-_date_form = '''<?xml version="1.0"?>
-<form string="Timesheets by month">
-    <separator string="Select a month" colspan="4"/>
-    <field name="month"/>
-    <field name="year"/>
-</form>'''
-
-_date_fields = {
-    'month' : {
-               'string' : 'Month',
-               'type' : 'selection',
-               'selection' : [(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')],
-               'required':True,
-               'default' : lambda * a: time.gmtime()[1]
-               },
-    'year' : {
-              'string' : 'Year',
-              'type' : 'integer',
-              'required':True,
-              'default' : lambda * a: time.gmtime()[0]
-              },
-}
-
-class wiz_bymonth(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[ ('end', 'Cancel', 'gtk-cancel'),('print', 'Print', 'gtk-ok')] }
-        },
-        'print': {
-            'actions': [],
-            'result': {'type': 'print', 'report': 'hr.attendance.bymonth', 'state': 'end' }
-        }
-    }
-wiz_bymonth('hr.attendance.print_month')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_attendance/wizard/print_byweek.py b/addons/hr_attendance/wizard/print_byweek.py
deleted file mode 100644
index d859e81aea5..00000000000
--- a/addons/hr_attendance/wizard/print_byweek.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import time
-
-_date_form = '''<?xml version="1.0"?>
-<form string="Timesheets by week">
-    <separator string="Select a starting and a end date" colspan="4"/>
-    <field name="init_date"/>
-    <newline/>
-    <field name="end_date"/>
-</form>'''
-
-_date_fields = {
-    'init_date': {'string':'Starting Date', 'type':'date', 'default':lambda *a: time.strftime('%Y-%m-%d'), 'required':True},
-    'end_date': {'string':'Ending Date', 'type':'date', 'default':lambda *a: time.strftime('%Y-%m-%d'), 'required':True}
-}
-
-class wiz_byweek(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('end','Cancel', 'gtk-cancel'), ('print','Print', 'gtk-ok')]}
-        },
-        'print': {
-            'actions': [],
-            'result': {'type': 'print', 'report': 'hr.attendance.allweeks', 'state':'end'}
-        }
-    }
-wiz_byweek('hr.attendance.print_week')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_attendance/wizard/sign_in_out.py b/addons/hr_attendance/wizard/sign_in_out.py
deleted file mode 100644
index 8e022a3c44f..00000000000
--- a/addons/hr_attendance/wizard/sign_in_out.py
+++ /dev/null
@@ -1,197 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import time
-from tools.translate import _
-
-si_so_form ='''<?xml version="1.0"?> 
-<form string="Sign in / Sign out">
-    <separator string="You are now ready to sign in or out of the attendance follow up" colspan="4" />
-    <field name="name" readonly="True" />
-    <field name="state" readonly="True" />
-</form>'''
-
-si_so_fields = {
-    'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
-    'state' : {'string' : "Current state", 'type' : 'char', 'required' : True, 'readonly': True},
-}
-
-si_form = '''<?xml version="1.0" ?>
-<form string="Sign in status">
-    <seperator string="This is the status of your sign in request. Check it out maybe you were already signed in." colspan="4" />
-    <field name="success" readonly="True" />
-</form>'''
-
-si_fields = {
-    'success' : {'string' : "Sign in's status", 'type' : 'char', 'required' : True, 'readonly' : True}, 
-}
-
-so_form = '''<?xml version="1.0" ?>
-<form string="Sign in status">
-    <seperator string="This is the status of your sign out request. Check it out maybe you were already signed out." colspan="4" />
-    <field name="success" readonly="True" />
-</for>'''
-
-so_fields = {
-    'success' : {'string' : "Sign out's status", 'type' : 'char', 'required' : True, 'readonly' : True}, 
-}
-
-def _get_empid(self, cr, uid, data, context):
-    service = netsvc.LocalService('object_proxy')
-    emp_id = service.execute(cr.dbname, uid, 'hr.employee', 'search', [('user_id', '=', uid)])
-    if emp_id:
-        employee = service.execute(cr.dbname, uid, 'hr.employee', 'read', emp_id)[0]
-        return {'name': employee['name'], 'state': employee['state'], 'emp_id': emp_id[0]}
-    return {}
-
-def _sign_in(self, cr, uid, data, context):
-    service = netsvc.LocalService('object_proxy')
-    emp_id = data['form']['emp_id']
-    if 'last_time' in data['form'] :
-        if data['form']['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
-            raise wizard.except_wizard(_('UserError'), _('The sign-out date must be in the past'))
-            return {'success': False}
-        service.execute(cr.dbname, uid, 'hr.attendance', 'create', {
-            'name': data['form']['last_time'], 
-            'action': 'sign_out',
-            'employee_id': emp_id
-        })
-    try:
-        success = service.execute(cr.dbname, uid, 'hr.employee', 'attendance_action_change', [emp_id], 'sign_in')
-    except:
-        raise wizard.except_wizard(_('UserError'), _('A sign-in must be right after a sign-out !'))
-    return {'success': success}
-
-def _sign_out(self, cr, uid, data, context):
-    service = netsvc.LocalService('object_proxy')
-    emp_id = data['form']['emp_id']
-    if 'last_time' in data['form'] :
-        if data['form']['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
-            raise wizard.except_wizard(_('UserError'), _('The Sign-in date must be in the past'))
-            return {'success': False}
-        service.execute(cr.dbname, uid, 'hr.attendance', 'create', {'name':data['form']['last_time'], 'action':'sign_in',  'employee_id':emp_id})
-    try:
-        success = service.execute(cr.dbname, uid, 'hr.employee', 'attendance_action_change', [emp_id], 'sign_out')
-    except:
-        raise wizard.except_wizard(_('UserError'), _('A sign-out must be right after a sign-in !'))
-
-    return {'success' : success}
-
-so_ask_form ='''<?xml version="1.0"?> 
-<form string="Sign in / Sign out">
-    <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
-    <field name="name" readonly="True" />
-    <field name="last_time" />
-</form>'''
-
-so_ask_fields = {
-    'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
-    'last_time' : {'string' : "Your last sign out", 'type' : 'datetime', 'required' : True},
-}
-
-def _si_check(self, cr, uid, data, context):
-    states = {True : 'si', False: 'si_ask_so'}
-    service = netsvc.LocalService('object_proxy')
-    emp_id = data['form']['emp_id']
-    att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id)], limit=1, order='name desc')
-    last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
-    if last_att:
-        last_att = last_att[0]
-    cond = not last_att or last_att['action'] == 'sign_out'
-    return states[cond]
-
-si_ask_form ='''<?xml version="1.0"?> 
-<form string="Sign in / Sign out">
-    <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
-    <field name="name" readonly="True" />
-    <field name="last_time" />
-</form>'''
-
-si_ask_fields = {
-    'name' : {'string' : "Employee's name", 'type':'char', 'required':True, 'readonly':True},
-    'last_time' : {'string' : "Your last sign in", 'type' : 'datetime', 'required' : True},
-}
-
-so_wo_si_form = '''<?xml version="1.0"?>
-<form string="Warning">
-    <label string="Sign-Out Entry must follow Sign-In." colspan="4" />
-</form>'''
-
-def _so_check(self, cr, uid, data, context):
-    states = {True : 'so', False: 'so_ask_si'}
-    service = netsvc.LocalService('object_proxy')
-    emp_id = data['form']['emp_id']
-    att_id = service.execute(cr.dbname, uid, 'hr.attendance', 'search', [('employee_id', '=', emp_id),('action','!=','action')], limit=1, order='name desc')
-    last_att = service.execute(cr.dbname, uid, 'hr.attendance', 'read', att_id)
-    if last_att:
-        last_att = last_att[0]
-
-    if not att_id and not last_att:
-        return 'so_wo_si'
-    cond = last_att and last_att['action'] == 'sign_in'
-    return states[cond]
-
-class wiz_si_so(wizard.interface):
-    states = {
-           'init' : {
-               'actions' : [_get_empid],
-               'result' : {'type' : 'form', 'arch' : si_so_form, 'fields' : si_so_fields, 
-                           'state' : [('end', 'Cancel', 'gtk-cancel'),
-                                      ('si_test', 'Sign in', 'gtk-go-back'),
-                                      ('so_test', 'Sign out', 'gtk-go-forward')]
-                          }
-            },
-            'si_test' : {
-                'actions' : [],
-                'result' : {'type' : 'choice', 'next_state': _si_check}
-            },
-            'si_ask_so' : {
-                'actions' : [],
-                'result' : {'type' : 'form', 'arch' : so_ask_form, 'fields' : so_ask_fields, 'state' : [('end', 'Cancel'),('si', 'Sign in') ] }
-            },
-            'si' : {
-                'actions' : [_sign_in],
-                'result' : {'type' : 'state', 'state':'end'}
-            },
-            'so_test' : {
-                'actions' : [],
-                'result' : {'type' : 'choice', 'next_state': _so_check }
-            },
-            'so_ask_si' : {
-                'actions' : [],
-                'result' : {'type' : 'form', 'arch' : si_ask_form, 'fields' : si_ask_fields, 'state' : [('end', 'Cancel'),('so', 'Sign out')] }
-            },
-            'so' : {
-                'actions' : [_sign_out],
-                'result' : {'type' : 'state', 'state':'end'}
-            },
-            'so_wo_si' : {
-                'actions' : [],
-                'result' : {'type' : 'form', 'arch' : so_wo_si_form, 'fields' : {}, 'state' : [('end', 'Ok')] }
-            },            
-    }
-wiz_si_so('hr.si_so')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_contract/__terp__.py b/addons/hr_contract/__openerp__.py
similarity index 100%
rename from addons/hr_contract/__terp__.py
rename to addons/hr_contract/__openerp__.py
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index b90f9dd1a89..b8a310cc7bd 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -18,23 +18,22 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+import time
 
 from osv import fields, osv
-import time
 
 class hr_employee(osv.osv):
     _name = "hr.employee"
     _description = "Employee"
     _inherit = "hr.employee"
     _columns = {
-        'manager' : fields.boolean('Manager'),
-        'medic_exam' : fields.date('Medical Examination Date'),
-        'place_of_birth' : fields.char('Place of Birth', size=30),
-        'children' : fields.integer('Number of Children'),
-        'vehicle' : fields.integer('Company Vehicle'),
-        'vehicle_distance' : fields.integer('Home-Work Distance', help="In kilometers"),
-        'contract_ids' : fields.one2many('hr.contract', 'employee_id', 'Contracts'),
+        'manager': fields.boolean('Manager'),
+        'medic_exam': fields.date('Medical Examination Date'),
+        'place_of_birth': fields.char('Place of Birth', size=30),
+        'children': fields.integer('Number of Children'),
+        'vehicle': fields.integer('Company Vehicle'),
+        'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
+        'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
     }
 hr_employee()
 
@@ -43,7 +42,7 @@ class hr_contract_wage_type_period(osv.osv):
     _name='hr.contract.wage.type.period'
     _description='Wage Period'
     _columns = {
-        'name' : fields.char('Period Name', size=50, required=True, select=True),
+        'name': fields.char('Period Name', size=50, required=True, select=True),
         'factor_days': fields.float('Hours in the period', digits=(12,4), required=True, help='This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee')
     }
     _defaults = {
@@ -72,7 +71,7 @@ class hr_contract_type(osv.osv):
     _name = 'hr.contract.type'
     _description = 'Contract Type'
     _columns = {
-        'name' : fields.char('Contract Type', size=30, required=True),
+        'name': fields.char('Contract Type', size=32, required=True),
     }
 hr_contract_type()
 
@@ -80,7 +79,7 @@ class hr_contract(osv.osv):
     _name = 'hr.contract'
     _description = 'Contract'
     _columns = {
-        'name': fields.char('Contract Reference', size=30, required=True),
+        'name': fields.char('Contract Reference', size=32, required=True),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
         'department_id': fields.related('employee_id','department_id', string="Department", readonly=True),
         'type_id': fields.many2one('hr.contract.type', "Contract Type"),
@@ -100,6 +99,4 @@ class hr_contract(osv.osv):
     }
 hr_contract()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 35c86cb206b..7578d66e98b 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -229,5 +229,10 @@
 
         <menuitem  id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
+
+        <!-- Contracts Button on Employee Form -->
+		<act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
+
+
     </data>
 </openerp>
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
index 2e9385b8c85..3ac9d53e7a9 100644
--- a/addons/hr_contract/i18n/ar.po
+++ b/addons/hr_contract/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/bg.po b/addons/hr_contract/i18n/bg.po
index 4378e4994d6..ad491b25f23 100644
--- a/addons/hr_contract/i18n/bg.po
+++ b/addons/hr_contract/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/bs.po b/addons/hr_contract/i18n/bs.po
index 084ac59f107..ed19a74cd5c 100644
--- a/addons/hr_contract/i18n/bs.po
+++ b/addons/hr_contract/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/ca.po b/addons/hr_contract/i18n/ca.po
index a005b4d751c..94648179226 100644
--- a/addons/hr_contract/i18n/ca.po
+++ b/addons/hr_contract/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po
index 2e9385b8c85..3ac9d53e7a9 100644
--- a/addons/hr_contract/i18n/cs.po
+++ b/addons/hr_contract/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index ce0146e196a..547151cc6e9 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po
index 87ba04a5ec9..3441f6060f3 100644
--- a/addons/hr_contract/i18n/el.po
+++ b/addons/hr_contract/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
index 7d5cf034150..a4b3b304856 100644
--- a/addons/hr_contract/i18n/es.po
+++ b/addons/hr_contract/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/es_AR.po b/addons/hr_contract/i18n/es_AR.po
index 1946dcbb165..1c4edda90fb 100644
--- a/addons/hr_contract/i18n/es_AR.po
+++ b/addons/hr_contract/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po
index 79f1e6d06e7..482fdbc53db 100644
--- a/addons/hr_contract/i18n/es_EC.po
+++ b/addons/hr_contract/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/et.po b/addons/hr_contract/i18n/et.po
index 8e2da8acdb1..a77b2ccfa33 100644
--- a/addons/hr_contract/i18n/et.po
+++ b/addons/hr_contract/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/fi.po b/addons/hr_contract/i18n/fi.po
index 507de8cf1e9..866056e9783 100644
--- a/addons/hr_contract/i18n/fi.po
+++ b/addons/hr_contract/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
index f2892d1e1fc..edf1ab42430 100644
--- a/addons/hr_contract/i18n/fr.po
+++ b/addons/hr_contract/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
index 5747a0c5fb4..a80f3f55224 100644
--- a/addons/hr_contract/i18n/hi.po
+++ b/addons/hr_contract/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/hr.po b/addons/hr_contract/i18n/hr.po
index 3849969528d..983272ba006 100644
--- a/addons/hr_contract/i18n/hr.po
+++ b/addons/hr_contract/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/hu.po b/addons/hr_contract/i18n/hu.po
index 2e9385b8c85..3ac9d53e7a9 100644
--- a/addons/hr_contract/i18n/hu.po
+++ b/addons/hr_contract/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/id.po b/addons/hr_contract/i18n/id.po
index 03e14251c7e..5b03a3fbda3 100644
--- a/addons/hr_contract/i18n/id.po
+++ b/addons/hr_contract/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po
index 6ce3e9d7c54..80d823d166b 100644
--- a/addons/hr_contract/i18n/it.po
+++ b/addons/hr_contract/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/ko.po b/addons/hr_contract/i18n/ko.po
index 8db3eb35d8d..cf1fd456018 100644
--- a/addons/hr_contract/i18n/ko.po
+++ b/addons/hr_contract/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/lt.po b/addons/hr_contract/i18n/lt.po
index 2e9385b8c85..3ac9d53e7a9 100644
--- a/addons/hr_contract/i18n/lt.po
+++ b/addons/hr_contract/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/lv.po b/addons/hr_contract/i18n/lv.po
index d5b1161d2f2..5ea30a089b0 100644
--- a/addons/hr_contract/i18n/lv.po
+++ b/addons/hr_contract/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/nl.po b/addons/hr_contract/i18n/nl.po
index b0b5cf6a620..9ff0a5a641b 100644
--- a/addons/hr_contract/i18n/nl.po
+++ b/addons/hr_contract/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/nl_BE.po b/addons/hr_contract/i18n/nl_BE.po
index 52b143ef8a5..85d0ea76a95 100644
--- a/addons/hr_contract/i18n/nl_BE.po
+++ b/addons/hr_contract/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/pl.po b/addons/hr_contract/i18n/pl.po
index 54174b2d631..a5dbd29b139 100644
--- a/addons/hr_contract/i18n/pl.po
+++ b/addons/hr_contract/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/pt.po b/addons/hr_contract/i18n/pt.po
index b3e3f0257a5..2ad0ff208f6 100644
--- a/addons/hr_contract/i18n/pt.po
+++ b/addons/hr_contract/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po
index d13017982c3..f8c90409981 100644
--- a/addons/hr_contract/i18n/pt_BR.po
+++ b/addons/hr_contract/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/ro.po b/addons/hr_contract/i18n/ro.po
index fc75b1f16a3..f00a5c25574 100644
--- a/addons/hr_contract/i18n/ro.po
+++ b/addons/hr_contract/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
index 1701b9eddfd..cd165caecb3 100644
--- a/addons/hr_contract/i18n/ru.po
+++ b/addons/hr_contract/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po
index bcef98887c2..6a08f34f71d 100644
--- a/addons/hr_contract/i18n/sl.po
+++ b/addons/hr_contract/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/sr.po b/addons/hr_contract/i18n/sr.po
index 8c44af2a398..a78af0f788b 100644
--- a/addons/hr_contract/i18n/sr.po
+++ b/addons/hr_contract/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
index f85105cdc81..e2d6837f1f5 100644
--- a/addons/hr_contract/i18n/sv.po
+++ b/addons/hr_contract/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/tlh.po b/addons/hr_contract/i18n/tlh.po
index e93fcf12869..5a565bedb42 100644
--- a/addons/hr_contract/i18n/tlh.po
+++ b/addons/hr_contract/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index c0f29de6c55..5c2b337e42c 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/uk.po b/addons/hr_contract/i18n/uk.po
index 2dd38374100..6ab400e8e19 100644
--- a/addons/hr_contract/i18n/uk.po
+++ b/addons/hr_contract/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index ed792d9a8d3..e10a5bd9f0e 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/zh_TW.po b/addons/hr_contract/i18n/zh_TW.po
index 74d35ae497c..01d7169f4ec 100644
--- a/addons/hr_contract/i18n/zh_TW.po
+++ b/addons/hr_contract/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_evaluation/__terp__.py b/addons/hr_evaluation/__openerp__.py
similarity index 100%
rename from addons/hr_evaluation/__terp__.py
rename to addons/hr_evaluation/__openerp__.py
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 7f16f55dce8..1d0be1f288e 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -313,11 +313,13 @@ class hr_evaluation_interview(osv.osv):
         """
         if not context:
             context = {}
+
         record = self.browse(cr, uid, ids, context)
         record = record and record[0]
         context.update({'survey_id': record.survey_id.id, 'response_id' : [record.response.id], 'response_no':0,})
         value = self.pool.get("survey").action_print_survey(cr, uid, ids, context)
         return value            
+
 hr_evaluation_interview()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 8af9a48b50c..bf6e45376e7 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -226,8 +226,8 @@
                         <separator orientation="vertical"/>
                         <field name="employee_id" widget="selection" select="1"/>
                         <field name="plan_id" widget="selection" select="1"/>
-					    </group>
-					    <newline/>
+                        </group>
+                        <newline/>
                         <group expand='1' string='Group by...'>
                         <filter string='Employee' icon="terp-stock" domain="[]" context="{'group_by' : 'employee_id'}" />
                         <filter string='Plan' icon="terp-stock" domain="[]" context="{'group_by' : 'plan_id'}" />
@@ -311,9 +311,9 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-crm" string="To Do" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-crm" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
-                        <filter string="My" icon="terp-partner" domain="[('user_id','=',uid)]"/>
+                        <filter string="My" icon="terp-partner" name="my" domain="[('user_id','=',uid)]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
@@ -329,7 +329,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
-            <field name="context">{"search_default_To Do":1,"search_default_My":1}</field>
+            <field name="context">{"search_default_todo":1,"search_default_my":1}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
@@ -342,5 +342,8 @@
            id="menu_eval_send_mail"
            action="action_hr_evaluation_send_mail"
            sequence="45"/>
+
+      <!-- Evaluation Interviews Button on Employee Form -->
+      <act_window domain="[('user_to_review_id', '=', active_id)]" id="act_hr_employee_2_hr__evaluation_interview" name="Evaluation Interviews" res_model="hr.evaluation.interview" src_model="hr.employee"/>
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 9445fa5a8ac..998a8519a83 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
index d0290bb8294..e5f70fb1a00 100644
--- a/addons/hr_evaluation/i18n/fi.po
+++ b/addons/hr_evaluation/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_expense/__terp__.py b/addons/hr_expense/__openerp__.py
similarity index 100%
rename from addons/hr_expense/__terp__.py
rename to addons/hr_expense/__openerp__.py
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index d4747758682..4e1e3033a92 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -19,20 +19,20 @@
 #
 ##############################################################################
 
-from mx import DateTime
 import time
 
 from osv import fields, osv
 from tools.translate import _
 
-def _employee_get(obj,cr,uid,context={}):
+def _employee_get(obj, cr, uid, context=None):
     ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
     if ids:
         return ids[0]
     return False
 
 class hr_expense_expense(osv.osv):
-    def copy(self, cr, uid, id, default=None, context={}):
+
+    def copy(self, cr, uid, id, default=None, context=None):
         if not default: default = {}
         default.update( {'invoice_id':False,'date_confirm':False,'date_valid':False,'user_valid':False})
         return super(hr_expense_expense, self).copy(cr, uid, id, default, context)
@@ -50,7 +50,7 @@ class hr_expense_expense(osv.osv):
             return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
 
     _name = "hr.expense.expense"
-    _description = "Expense"
+    _description = "HR Expense"
     _columns = {
         'name': fields.char('Expense Sheet', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
@@ -84,9 +84,9 @@ class hr_expense_expense(osv.osv):
         'date' : lambda *a: time.strftime('%Y-%m-%d'),
         'state': lambda *a: 'draft',
         'employee_id' : _employee_get,
-        'user_id' : lambda cr,uid,id,c={}: id,
+        'user_id' : lambda cr, uid, id, c={}: id,
         'currency_id': _get_currency,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     def expense_confirm(self, cr, uid, ids, *args):
         #for exp in self.browse(cr, uid, ids):
@@ -175,17 +175,16 @@ hr_expense_expense()
 
 class product_product(osv.osv):
     _inherit = "product.product"
-
     _columns = {
-        'hr_expense_ok': fields.boolean('Can constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
+        'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
     }
 
 product_product()
 
-
 class hr_expense_line(osv.osv):
     _name = "hr.expense.line"
     _description = "Expense Line"
+
     def _amount(self, cr, uid, ids, field_name, arg, context):
         if not len(ids):
             return {}
@@ -212,8 +211,11 @@ class hr_expense_line(osv.osv):
         'date_value' : lambda *a: time.strftime('%Y-%m-%d'),
     }
     _order = "sequence"
-    def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context={}):
-        v={}
+
+    def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
+        if context is None:
+            context = {}
+        v = {}
         if product_id:
             product=self.pool.get('product.product').browse(cr,uid,product_id, context=context)
             v['name']=product.name
@@ -227,9 +229,8 @@ class hr_expense_line(osv.osv):
             v['unit_amount']=amount_unit
             if not uom_id:
                 v['uom_id']=product.uom_id.id
-        return {'value':v}
+        return {'value': v}
 
 hr_expense_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 7b18fa14996..b8f3c1928ed 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -26,11 +26,10 @@
             <field name="model">hr.expense.expense</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Expenses"
-                    colors="blue:state == 'draft'">
+                <tree string="Expenses" colors="blue:state=='draft'">
                     <field name="date"/>
                     <field name="employee_id"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="base.group_extended"/>
                     <field name="name"/>
                     <field name="ref"/>
                     <field name="amount"/>
@@ -49,7 +48,7 @@
                 <tree string="Expenses" editable="top">
                     <field name="date"/>
                     <field name="employee_id"/>
-                    <field name="department_id"/>
+                    <field name="department_id" groups="base.group_extended"/>
                     <field name="name"/>
                     <field name="ref"/>
                     <field name="amount"/>
@@ -69,32 +68,32 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
                         <field name="employee_id" select="1"/>
-                        <field name="ref" select="2"/>
+                        <field name="ref"/>
                         <field name="date" select="1"/>
                         <field name="amount"/>
                         <field name="currency_id"/>
-                        <field name="department_id"/>
-                        <field name="company_id"/>
+                        <field name="department_id" groups="base.group_extended"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Expense Sheet">
                             <newline/>
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" select="2"/>
-                                    <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" select="2"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
+                                    <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
                                     <field name="name" select="1"/>
                                     <field name="date_value" select="1"/>
-                                    <field name="unit_quantity" select="2"/>
-                                    <field name="unit_amount" select="2"/>
-                                    <field name="ref" select="2"/>
-                                    <field name="sequence"/>
-                                    <field domain="[('type','=','normal')]" name="analytic_account"/>
+                                    <field name="unit_quantity"/>
+                                    <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"/>
                                     <newline/>
                                     <field name="total_amount"/>
                                 </form>
                             </field>
-                            <field name="state" select="2"/>
+                            <field name="state"/>
                             <group col="6" colspan="2">
                                 <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
                                 <button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
@@ -104,14 +103,14 @@
                                 <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no"/>
                             </group>
                         </page>
-                        <page string="Other Info">
+                        <page string="Other Info" groups="base.group_extended">
                             <separator colspan="4" string="Accounting data"/>
                             <field name="journal_id"/>
                             <separator colspan="4" string="Validation"/>
-                            <field name="date_confirm" select="2" readonly = "1"/>
-                            <field name="date_valid" select="2" readonly = "1"/>
-                            <field name="user_valid" select="2"/>
-                            <field name="invoice_id" select="2"/>
+                            <field name="date_confirm" readonly = "1"/>
+                            <field name="date_valid" readonly = "1"/>
+                            <field name="user_valid"/>
+                            <field name="invoice_id"/>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
@@ -127,7 +126,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Expense">
-                	<group>
+                    <group>
                       <filter
                         icon="terp-hr"
                         domain="[('state','=','draft')]"
@@ -148,14 +147,14 @@
                       <field name="date" select='1'/>
                       <field name="user_id" select="1" widget="selection">
                           <filter
-                            icon="gtk-execute" string="My Expns"
+                            icon="gtk-execute" name="my_expns"
                             help="My Expenses"
                             domain="[('user_id','=',uid)]"/>
                           <filter icon="terp-hr"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
-                      <field name="department_id" widget="selection" />
+                      <field name="department_id" widget="selection" groups="base.group_extended"/>
                 </group>
                 <newline />
                 <group expand="1" string="Group By..." colspan="11" col="11">
@@ -172,7 +171,7 @@
             <field name="name">Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_My Expns":1}</field>
+            <field name="context">{"search_default_my_expns":1}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
diff --git a/addons/hr_expense/i18n/ar.po b/addons/hr_expense/i18n/ar.po
index 204081ef380..696020ae7af 100644
--- a/addons/hr_expense/i18n/ar.po
+++ b/addons/hr_expense/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/bg.po b/addons/hr_expense/i18n/bg.po
index 6c6de6f481f..ad61a283151 100644
--- a/addons/hr_expense/i18n/bg.po
+++ b/addons/hr_expense/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/bs.po b/addons/hr_expense/i18n/bs.po
index 9024a6619fe..dd32889b44e 100644
--- a/addons/hr_expense/i18n/bs.po
+++ b/addons/hr_expense/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index 87dc638146b..488baa21224 100644
--- a/addons/hr_expense/i18n/ca.po
+++ b/addons/hr_expense/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/cs.po b/addons/hr_expense/i18n/cs.po
index 204081ef380..696020ae7af 100644
--- a/addons/hr_expense/i18n/cs.po
+++ b/addons/hr_expense/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index 449bd7e727d..64feb6a4940 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-10 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index d74515b1752..823e8e8eabf 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index a3fe8f859ac..73923251e50 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/es_AR.po b/addons/hr_expense/i18n/es_AR.po
index 19f7dc87ab6..9e54bf369dd 100644
--- a/addons/hr_expense/i18n/es_AR.po
+++ b/addons/hr_expense/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/et.po b/addons/hr_expense/i18n/et.po
index c3d556fd1d4..231a357b321 100644
--- a/addons/hr_expense/i18n/et.po
+++ b/addons/hr_expense/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/fi.po b/addons/hr_expense/i18n/fi.po
index 08e61d36c8c..3c82ab8fbcf 100644
--- a/addons/hr_expense/i18n/fi.po
+++ b/addons/hr_expense/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index bda3622763d..e087631b7a0 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/hr.po b/addons/hr_expense/i18n/hr.po
index b8e596949bc..696020ae7af 100644
--- a/addons/hr_expense/i18n/hr.po
+++ b/addons/hr_expense/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po
index 204081ef380..696020ae7af 100644
--- a/addons/hr_expense/i18n/hu.po
+++ b/addons/hr_expense/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/id.po b/addons/hr_expense/i18n/id.po
index 8f9db1c5421..7845b2b0970 100644
--- a/addons/hr_expense/i18n/id.po
+++ b/addons/hr_expense/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/it.po b/addons/hr_expense/i18n/it.po
index 7117284eb10..f5d23421c1d 100644
--- a/addons/hr_expense/i18n/it.po
+++ b/addons/hr_expense/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ko.po b/addons/hr_expense/i18n/ko.po
index bff08e6ee06..b1d0bd8fb84 100644
--- a/addons/hr_expense/i18n/ko.po
+++ b/addons/hr_expense/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/lt.po b/addons/hr_expense/i18n/lt.po
index 204081ef380..696020ae7af 100644
--- a/addons/hr_expense/i18n/lt.po
+++ b/addons/hr_expense/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/lv.po b/addons/hr_expense/i18n/lv.po
index 5691e460846..f98071621e5 100644
--- a/addons/hr_expense/i18n/lv.po
+++ b/addons/hr_expense/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index 3f4e3a99f51..7a778e264c7 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/nl_BE.po b/addons/hr_expense/i18n/nl_BE.po
index a19b3b62b60..1d86866af3f 100644
--- a/addons/hr_expense/i18n/nl_BE.po
+++ b/addons/hr_expense/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/pl.po b/addons/hr_expense/i18n/pl.po
index 128b287e541..5b526ea64fc 100644
--- a/addons/hr_expense/i18n/pl.po
+++ b/addons/hr_expense/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/pt.po b/addons/hr_expense/i18n/pt.po
index 19b32aae8f1..0796a8c154e 100644
--- a/addons/hr_expense/i18n/pt.po
+++ b/addons/hr_expense/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 083ad5e2404..e8c272271cc 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ro.po b/addons/hr_expense/i18n/ro.po
index 04ff3b9f74b..f495d496181 100644
--- a/addons/hr_expense/i18n/ro.po
+++ b/addons/hr_expense/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po
index d8bf86caebb..0387d6bef52 100644
--- a/addons/hr_expense/i18n/ru.po
+++ b/addons/hr_expense/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sl.po b/addons/hr_expense/i18n/sl.po
index 4e879055210..bcfaa675c08 100644
--- a/addons/hr_expense/i18n/sl.po
+++ b/addons/hr_expense/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sr.po b/addons/hr_expense/i18n/sr.po
index d8563388828..3889c2a83fc 100644
--- a/addons/hr_expense/i18n/sr.po
+++ b/addons/hr_expense/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index 45613d1189a..a9079f64afc 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/tlh.po b/addons/hr_expense/i18n/tlh.po
index 081428dba15..d87aee30d12 100644
--- a/addons/hr_expense/i18n/tlh.po
+++ b/addons/hr_expense/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+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 6d5640548e8..c53bc3c5270 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/uk.po b/addons/hr_expense/i18n/uk.po
index 43b36f79f8d..1f39674161c 100644
--- a/addons/hr_expense/i18n/uk.po
+++ b/addons/hr_expense/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index b5a4013ff8b..f160263a9ee 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/zh_TW.po b/addons/hr_expense/i18n/zh_TW.po
index 7233534c1ed..da9ff657bab 100644
--- a/addons/hr_expense/i18n/zh_TW.po
+++ b/addons/hr_expense/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 7a3c9b25d18..2f9a0afb29c 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -56,7 +56,8 @@
                 <filter icon="terp-hr"
                     string="Draft"
                     domain="[('state','=','draft')]"/>
-                <filter icon="terp-hr" string="Expenses"
+                <filter icon="terp-hr" name="expenses"
+                    string="Expenses"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancelled')]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
@@ -70,7 +71,7 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}"/>
-                    <filter string="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                    <filter string="User" name="by_user" icon="terp-hr" context="{'group_by':'user_id'}"/>
                     <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
                     <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
@@ -89,7 +90,7 @@
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_Expenses":1,"search_default_User":1}</field>
+        <field name="context">{"search_default_expenses":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__openerp__.py
similarity index 96%
rename from addons/hr_holidays/__terp__.py
rename to addons/hr_holidays/__openerp__.py
index bdd902923eb..f5a57313348 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -55,6 +55,8 @@
         'hr_holidays_view.xml',
         'hr_holidays_wizard.xml',
         'hr_holidays_report.xml',
+        'wizard/hr_holidays_summary_department_view.xml',
+        'wizard/hr_holidays_summary_employees_view.xml',
         #'process/hr_holidays_process.xml'
     ],
     'demo_xml': [],
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 4265400df8c..cd0d86457d9 100755
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -50,8 +50,11 @@ class hr_holidays_status(osv.osv):
         return res
 
     def _user_left_days(self, cr, uid, ids, name, args, context={}):
-        res = {}
         return_false = False
+        employee_id = False
+        res = {}
+        for id in ids:
+            res[id] = {}.fromkeys(name, 0)
         if context and context.has_key('employee_id'):
             if not context['employee_id']:
                 return_false = True
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 69b53af4bf2..92e4acd7f63 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -12,9 +12,7 @@
                         <filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/>
                         <filter icon="terp-hr" domain="[('state','=','validate')]" string="Validated"/>
                         <separator orientation="vertical"/> 
-                        <filter icon="terp-hr" help="My Leaves" domain="[('user_id','=',uid)]" string="My Leaves"/>
-                        <separator orientation="vertical"/> 
-                        <field name="user_id" widget="selection" />
+                        <field name="user_id" widget="selection" default="uid"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-hr"
                                 domain="[('department_id.manager_id','=',uid)]"
@@ -284,10 +282,10 @@
             <field name="arch" type="xml">
                 <form string="Leave Type">
                     <field colspan="4" name="name" select="1"/>
-                    <field name="limit" select="2"/>
-                    <field name="active" select="2"/>
+                    <field name="limit"/>
+                    <field name="active"/>
                     <field name="categ_id"  select="1" widget="selection"/>
-                    <field name="color_name" select="2"/>
+                    <field name="color_name"/>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index a747571c943..244668ec719 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -11,22 +11,21 @@
             name="Holidays"
             parent="hr.menu_hr_reporting"
             sequence="3" />
-	<wizard string="Holidays by Departement"
+	<!--<wizard string="Holidays by Departement"
 		  name="hr.holidays.summary"
-		  id="holidays_summary"/>
-	<menuitem name="Leaves by Departement" parent="menu_hr_reporting_holidays"
+		  id="holidays_summary"/>-->
+	<!--<menuitem name="Leaves by Departement" parent="menu_hr_reporting_holidays"
                   icon="STOCK_PRINT"
 		 action="holidays_summary"
 		 type="wizard"
 		 id="menu_holidays_summary" sequence="20"/>
-
-	 <!-- restrict menu access to HR Manager -->
 	 <record model='ir.ui.menu' id="menu_holidays_summary">
 		 <field eval="[(6,0,[ref('hr.group_hr_manager')])]" name="groups_id"/>
   	 </record>
+-->
 
-	<wizard string="Employee's Holidays"
+	<!--<wizard string="Employee's Holidays"
 		model="hr.employee" name="hr.holidays.summary.employee"
-		keyword="client_print_multi" id="wizard_holidays_summary" />
+		keyword="client_print_multi" id="wizard_holidays_summary" />-->
  	</data>
 </openerp>
diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po
index a4c8c82fa99..5f26cc4cce9 100644
--- a/addons/hr_holidays/i18n/ar.po
+++ b/addons/hr_holidays/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index ab515d9d8a9..059d3f2ec9b 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index ebc0e7f6380..1e8967fa4f2 100644
--- a/addons/hr_holidays/i18n/bs.po
+++ b/addons/hr_holidays/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 5f4656cbd36..9d4eb411501 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index 5c8c25fc49c..0bf885221a5 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index 65f273fbc50..844e6dc1f92 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index 303a6a5104d..e9a8298392e 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 9ade226f6ac..60a661a9717 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index 5976f6fe3c6..0be2a743702 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index eef43f8b95d..4da9792e518 100644
--- a/addons/hr_holidays/i18n/es_EC.po
+++ b/addons/hr_holidays/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index e727c747f7c..525dc107a0a 100644
--- a/addons/hr_holidays/i18n/et.po
+++ b/addons/hr_holidays/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index 8aa97a2cf68..98cc3cf88bb 100644
--- a/addons/hr_holidays/i18n/fi.po
+++ b/addons/hr_holidays/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index bbd0f5ae965..8f62504f964 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index 453b1726454..e9464d15726 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index c447222196a..59f2b4b30db 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index 593de018bfb..eda0c0e6363 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index 1796d82c133..2a19ca68dcb 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index b93d36bb933..7bab4f39054 100644
--- a/addons/hr_holidays/i18n/ko.po
+++ b/addons/hr_holidays/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+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 b5f593d4b33..dff11197da4 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index 27657fd6b3e..bd3d56a4a54 100644
--- a/addons/hr_holidays/i18n/lv.po
+++ b/addons/hr_holidays/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index 54309e484e8..02819b8cfe7 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index fac83d8864d..e7dff159671 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index 23c5f27fc59..19df489b338 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index 96f4f84121c..2d194cfee64 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index 5a7585e11b4..f7f6fc8cbb6 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index 7ec310081f6..e3465d4cab2 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index 56efed4f8a5..256b3f212f6 100644
--- a/addons/hr_holidays/i18n/ru.po
+++ b/addons/hr_holidays/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index d5d0d83c74d..dc9ac5e3168 100644
--- a/addons/hr_holidays/i18n/sl.po
+++ b/addons/hr_holidays/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index 1f3d8b08bf3..1586b7046bd 100644
--- a/addons/hr_holidays/i18n/sr.po
+++ b/addons/hr_holidays/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index 740e8e4d16f..b873cb18c17 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index 4417ac76370..16369b963fe 100644
--- a/addons/hr_holidays/i18n/th.po
+++ b/addons/hr_holidays/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index c785a5ee37e..2a4fa579e70 100644
--- a/addons/hr_holidays/i18n/tlh.po
+++ b/addons/hr_holidays/i18n/tlh.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+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 ce6efce9df8..3679cef9d32 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index 9e35879f3bf..3e9d43818e4 100644
--- a/addons/hr_holidays/i18n/uk.po
+++ b/addons/hr_holidays/i18n/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+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 abe62d19b0d..b4242f47b23 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index a4c8c82fa99..5f26cc4cce9 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index c61e8f733b4..77dde5b4575 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -39,8 +39,8 @@ def strToDate(dt):
         dt_date=datetime.date(int(dt[0:4]),int(dt[5:7]),int(dt[8:10]))
         return dt_date
     else:
-        return 
-    
+        return
+
 
 def emp_create_xml(self,cr,uid,dept,holiday_type,row_id,empid,name,som,eom):
     display={}
@@ -48,11 +48,11 @@ def emp_create_xml(self,cr,uid,dept,holiday_type,row_id,empid,name,som,eom):
         count=0
         p_id=pooler.get_pool(cr.dbname).get('hr.holidays').search(cr,uid,[('employee_id','in',[empid,False]), ('type', '=', 'remove')])
         ids_date = pooler.get_pool(cr.dbname).get('hr.holidays').read(cr,uid,p_id,['date_from','date_to','holiday_status_id','state'])
-        
+
         for index in range(1,61):
             diff=index-1
             current=som+datetime.timedelta(diff)
-            
+
             for item in ids_date:
                 if current >= strToDate(item['date_from']) and current <= strToDate(item['date_to']):
                     if item['state'] in holiday_type:
@@ -210,19 +210,18 @@ class report_custom(report_rml):
         row_id=1
 
         if data['model']=='hr.employee':
-
-            for id in data['form']['emp'][0][2]:
+            for id in data['form']['emp']:
                  items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr,uid,id,['id','name'])
 
                  emp_xml += emp_create_xml(self,cr,uid,0,holiday_type,row_id,items['id'],items['name'],som, eom)
                  row_id = row_id +1
-                 
+
         elif data['model']=='ir.ui.menu':
-            for id in data['form']['depts'][0][2]:
+            for id in data['form']['depts']:
                 dept = pooler.get_pool(cr.dbname).get('hr.department').browse(cr, uid, id, context.copy())
                 depts.append(dept)
-                dept_ids = tuple(data['form']['depts'][0][2])
-                
+                dept_ids = tuple(data['form']['depts'])
+
                 cr.execute("""select dept_user.user_id \
                 from hr_department_user_rel dept_user \
                 where dept_user.department_id = %s\
@@ -258,7 +257,7 @@ class report_custom(report_rml):
         %s
         </report>
         ''' % (months_xml,date_xml, emp_xml)
-        
+
         return xml
 
 report_custom('report.holidays.summary', 'hr.holidays', '', 'addons/hr_holidays/report/holidays_summary.xsl')
diff --git a/addons/hr_holidays/wizard/__init__.py b/addons/hr_holidays/wizard/__init__.py
index 310328a15c1..19228a07fac 100644
--- a/addons/hr_holidays/wizard/__init__.py
+++ b/addons/hr_holidays/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,12 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import holidays_summary
-import holidays_summary_employees
+import hr_holidays_summary_department
+import hr_holidays_summary_employees
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_holidays/wizard/holidays_summary.py b/addons/hr_holidays/wizard/holidays_summary.py
deleted file mode 100644
index 0b6a05247f0..00000000000
--- a/addons/hr_holidays/wizard/holidays_summary.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#    $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import datetime
-import time
-import pooler
-
-form='''<?xml version="1.0"?>
-<form string="Report Options">
-    <field name="date_from" colspan="2" />
-    <field name="holiday_type" colspan="2" />
-    <field name="depts" colspan="4" />
-
-</form>'''
-
-zero_form='''<?xml version="1.0"?>
-<form string="Notification">
-<label string="You have to select at least 1 Department. Try again." colspan="4"/>
-</form>'''
-
-zero_fields={
-}
-
-class wizard_report(wizard.interface):
-    def _check(self, cr, uid, data, context):
-        data['form']['date_from']=time.strftime('%Y-%m-%d')
-        data['form']['holiday_type']='Validated'
-
-        return data['form']
-
-    def _checkdepts(self, cr, uid, data, context):
-
-        if len(data['form']['depts'][0][2])==0:
-            return 'notify'
-        else:
-            return 'report'
-
-    fields={
-        'date_from':{
-                'string':'From',
-                'type':'date',
-                'required':True,
-        },
-        'depts': {
-                'string': 'Department(s)', 
-                'type': 'many2many', 
-                'relation': 'hr.department'
-        },
-        'holiday_type':{
-                'string':"Select Holiday Type",
-                'required':True,
-                'type':'selection',
-                'selection':[('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')]
-        },
-    }
-
-    states={
-        'init':{
-            'actions':[_check],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel', 'gtk-cancel'), ('checkdept', 'Print', 'gtk-print')]}
-        },
-        'checkdept': {
-            'actions': [],
-            'result': {'type':'choice','next_state':_checkdepts}
-        },
-        'notify': {
-            'actions': [],
-            'result': {'type':'form','arch':zero_form,'fields':zero_fields,'state':[('end','Ok', 'gtk-ok')]}
-        },
-        'report':{
-            'actions':[],
-            'result':{'type':'print', 'report':'holidays.summary', 'state':'end'}
-        }
-    }
-wizard_report('hr.holidays.summary')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_holidays/wizard/holidays_summary_employees.py b/addons/hr_holidays/wizard/holidays_summary_employees.py
deleted file mode 100644
index bdc5664abfb..00000000000
--- a/addons/hr_holidays/wizard/holidays_summary_employees.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import datetime
-import time
-import pooler
-
-
-form='''<?xml version="1.0"?>
-<form string="Employee's Holidays">
-    <field name="date_from" colspan="2" />
-    <field name="holiday_type" colspan="2" />
-    <field name="emp" colspan="4" invisible="True"/>
-</form>'''
-
-zero_form='''<?xml version="1.0"?>
-<form string="Notification">
-<label string="You have to select at least 1 Employee. Try again." colspan="4"/>
-</form>'''
-
-zero_fields={
-}
-
-class wizard_report(wizard.interface):
-    def _check(self, cr, uid, data, context):
-        data['form']['date_from']=time.strftime('%Y-%m-%d')
-        data['form']['holiday_type']='Validated'
-        data['form']['emp'] = data['ids']
-        return data['form']
-
-    def _checkemps(self, cr, uid, data, context):
-
-        if len(data['form']['emp'][0][2])==0:
-            return 'notify'
-        else:
-            return 'report'
-
-    fields={
-        'date_from':{
-            'string':'From',
-            'type':'date',
-            'required':True,
-        },
-        'holiday_type':{'string':"Select Holiday Type",'type':'selection','selection':[('Validated','Validated'),('Confirmed','Confirmed'),('both','Both')]},
-        'emp': {'string': 'Employee(s)', 'type': 'many2many', 'relation': 'hr.employee'},
-    }
-
-    states={
-        'init':{
-            'actions':[_check],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel','gtk-cancel'), ('checkemp', 'Print', 'gtk-print')]}
-        },
-        'checkemp': {
-            'actions': [],
-            'result': {'type':'choice','next_state':_checkemps}
-        },
-        'notify': {
-            'actions': [],
-            'result': {'type':'form','arch':zero_form,'fields':zero_fields,'state':[('end','Ok', 'gtk-ok')]}
-        },
-        'report':{
-            'actions':[],
-            'result':{'type':'print', 'report':'holidays.summary', 'state':'end'}
-        }
-    }
-wizard_report('hr.holidays.summary.employee')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
new file mode 100644
index 00000000000..5e35bbdb916
--- /dev/null
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import osv, fields
+from tools.translate import _
+
+class hr_holidays_summary_dept(osv.osv_memory):
+    _name = 'hr.holidays.summary.dept'
+    _description = 'HR Holidays Summary Report By Department'
+    _columns = {
+        'date_from': fields.date('From', required=True),
+        'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
+        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
+                }
+
+    _defaults = {
+         'date_from': time.strftime('%Y-%m-%d'),
+         'holiday_type': 'Validated'
+                 }
+
+    def print_report(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, [])[0]
+        if not data['depts']:
+            raise osv.except_osv(_('Error'), _('You have to select at least 1 Department. And try again'))
+        datas = {
+             'ids': [],
+             'model': 'ir.ui.menu',
+             'form': data
+                 }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'holidays.summary',
+            'datas': datas,
+            }
+
+hr_holidays_summary_dept()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
new file mode 100644
index 00000000000..fabc11d6021
--- /dev/null
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="view_hr_holidays_summary_dept" model="ir.ui.view">
+            <field name="name">hr.holidays.summary.dept.form</field>
+            <field name="model">hr.holidays.summary.dept</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Holidays by Departement">
+			    <group col="4" colspan="6">
+				    <field name="date_from"/>
+				    <newline/>
+				    <field name="holiday_type"/>
+				    <newline/>
+				    <field name="depts"/>
+				</group>
+				<separator colspan="4"/>
+			    <group col="2" colspan="4">
+	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+				</group>
+			</form>
+            </field>
+        </record>
+
+        <record id="action_hr_holidays_summary_dept" model="ir.actions.act_window">
+            <field name="name">Holidays by Departement</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.holidays.summary.dept</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+		<menuitem
+	        name="Leaves by Departement"
+	        parent="menu_hr_reporting_holidays"
+	        action="action_hr_holidays_summary_dept"
+	        id="menu_account_central_journal"
+	        icon="STOCK_PRINT"/>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
new file mode 100644
index 00000000000..1452c864c7f
--- /dev/null
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import osv, fields
+from tools.translate import _
+
+class hr_holidays_summary_employee(osv.osv_memory):
+    _name = 'hr.holidays.summary.employee'
+    _description = 'HR Holidays Summary Report By Employee'
+    _columns = {
+        'date_from': fields.date('From', required=True),
+        'emp': fields.many2many('hr.employee', 'summary_emp_rel', 'sum_id', 'emp_id', 'Employee(s)'),
+        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
+                }
+
+    _defaults = {
+         'date_from': time.strftime('%Y-%m-%d'),
+         'holiday_type': 'Validated',
+                 }
+
+    def print_report(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, [])[0]
+        data['emp'] = context['active_ids']
+        datas = {
+             'ids': [],
+             'model': 'hr.employee',
+             'form': data
+                 }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'holidays.summary',
+            'datas': datas,
+            }
+
+hr_holidays_summary_employee()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
new file mode 100644
index 00000000000..0957083a136
--- /dev/null
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<record id="view_hr_holidays_summary_employee" model="ir.ui.view">
+            <field name="name">hr.holidays.summary.employee.form</field>
+            <field name="model">hr.holidays.summary.employee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Employee's Holidays">
+			    <group col="4" colspan="6">
+				    <field name="date_from"/>
+				    <newline/>
+				    <field name="holiday_type"/>
+				    <newline/>
+				    <field name="emp" invisible="True"/>
+				</group>
+				<separator colspan="4"/>
+			    <group col="2" colspan="4">
+	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+				</group>
+			</form>
+            </field>
+        </record>
+
+        <record id="action_hr_holidays_summary_employee" model="ir.actions.act_window">
+            <field name="name">Employee's Holidays</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.holidays.summary.employee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+		<record model="ir.values" id="hr_holidays_summary_employee_value">
+            <field name="model_id" ref="hr.model_hr_employee" />
+            <field name="object" eval="1" />
+            <field name="name">Employee's Holidays</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_holidays_summary_employee'))" />
+            <field name="key">action</field>
+            <field name="model">hr.employee</field>
+        </record>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_recruitment/__terp__.py b/addons/hr_recruitment/__openerp__.py
similarity index 100%
rename from addons/hr_recruitment/__terp__.py
rename to addons/hr_recruitment/__openerp__.py
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 8cb7dd0924b..6fe8b91aa3e 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -163,7 +163,6 @@ class hr_applicant(osv.osv):
         """
         if not context:
             context = {}
-
         record = self.browse(cr, uid, ids, context)
         record = record and record[0]
         context.update({'survey_id': record.survey.id, 'response_id' : [record.response], 'response_no':0,})
@@ -179,4 +178,4 @@ class hr_job(osv.osv):
         'survey_id': fields.many2one('survey', 'Survey'),
     }
 
-hr_job()
+hr_job()
\ No newline at end of file
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 88011aa817c..bbf32cf0501 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -9,7 +9,7 @@
         <field name="res_model">hr.applicant</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view_job"/>
-        <field name="context">{"search_default_Current":1,"search_default_My Recrui":1}</field>
+        <field name="context">{"search_default_current":1,"search_default_my_recrui":1}</field>
         <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
 
     </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 96f8718bf9a..2367603502c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -73,7 +73,7 @@
                     <label string="Stage: " align="1.0"/>
                     <group colspan="1" col="3">
                         <field name="stage_id" nolabel="1"/>
-                		<button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
+                        <button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
                     <field name="user_id"/>
@@ -87,9 +87,9 @@
                     <field name="department_id" widget="selection"/>
                     <button name="action_makeMeeting" type="object"
                         string="Schedule Meeting" icon="terp-hr" />
-					<button name="action_print_survey" string="Print Interview" type="object"
-						icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-				</group>
+                    <button name="action_print_survey" string="Print Interview" type="object"
+                        icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
+                </group>
                 <notebook colspan="4">
                     <page string="Job Info">
                         <group col="2" colspan="2">
@@ -202,7 +202,7 @@
         <field name="arch" type="xml">
             <search string="Search Jobs">
                <group>
-               <filter icon="gtk-new" string="Current"
+               <filter icon="gtk-new" string="Current" name="current"
                    domain="[('state','in',('draft','open'))]"
                    help="All new and in progress jobs"
                />
@@ -224,7 +224,7 @@
                <field name="job_id" widget="selection"/>
                <newline/>
                <field name="user_id" widget="selection">
-                    <filter domain="[('user_id','=',uid)]" string="My Recrui" help="My Recruitements" icon="gtk-execute"/>
+                    <filter domain="[('user_id','=',uid)]" name="my_recrui" help="My Recruitements" icon="gtk-execute"/>
                     <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="gtk-execute" separator="1"/>
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 2b8c451949c..286499e0ae8 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -39,7 +39,6 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Recruitments">
-                <group>
                 <filter icon="terp-hr"
                     string="This Year"
                     domain="[('year','=',time.strftime('%%Y'))]"
@@ -59,9 +58,8 @@
                         string="My Recruitments"
                         domain="[('user_id','=',uid)]"/>
                 </field>
-                </group>
                 <newline/>
-                <group expand="1" string="Extended options...">
+                <group expand="1" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-hr"
                     		string="Not Good"
                     		domain="[('priority','=','5')]"/>
@@ -78,9 +76,10 @@
                     		string="Excellent"
                     		domain="[('priority','=','1')]"/>
                 </group>
+
                 <newline/>
-                <group expand="1" string="Group By...">
-                   <filter string="User" icon="terp-hr" domain="[]" context="{'group_by':'user_id'}" />
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                   <filter string="User" name="by_user" icon="terp-hr" domain="[]" context="{'group_by':'user_id'}" />
                    <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}"/>
                    <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}"/>
                    <separator orientation="vertical"/>
@@ -101,7 +100,7 @@
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_User":1}</field>
+        <field name="context">{"search_default_user_id":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root"/>
diff --git a/addons/hr_timesheet/__terp__.py b/addons/hr_timesheet/__openerp__.py
similarity index 93%
rename from addons/hr_timesheet/__terp__.py
rename to addons/hr_timesheet/__openerp__.py
index 976242edc0c..a917ed2df4c 100644
--- a/addons/hr_timesheet/__terp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -44,7 +44,9 @@ to set up a management by affair.
         'hr_timesheet_view.xml',
         'hr_timesheet_report.xml',
         'hr_timesheet_wizard.xml',
-        'process/hr_timesheet_process.xml'
+        'process/hr_timesheet_process.xml',
+        'wizard/hr_timesheet_print_employee_view.xml',
+        'wizard/hr_timesheet_print_users_view.xml'
     ],
     'demo_xml': ['hr_timesheet_demo.xml'],
     'installable': True,
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index 9b7c527fea9..6fa7185c7e9 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -13,32 +13,32 @@
             sequence="1" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
-        <wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
-
+        <!--<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
+-->
         <!--<menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/>-->
        <!-- <menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"
             groups="hr.group_hr_manager"/>-->
-        <menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="menu_hr_reporting_timesheet" type="wizard"
+        <!--<menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="menu_hr_reporting_timesheet" type="wizard"
 
             groups="hr.group_hr_manager"
-            />
-        <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
+            />-->
+       <!-- <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
         <menuitem
             action="wizard_hr_timesheet_my"
             id="menu_wizard_hr_timesheet_my"
             parent="menu_hr_reporting_timesheet"
             type="wizard"
             groups="hr.group_hr_user"
-            />
+            />-->
 
         <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
 
         <wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet"/>
-        <menuitem
+        <!--<menuitem
             action="wizard_hr_timesheet_users"
             id="menu_wizard_hr_timesheet_users"
             groups="hr.group_hr_manager"
             parent="menu_hr_reporting_timesheet" type="wizard"/>
-
+-->
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d8f318d148b..6c52c99d081 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -27,7 +27,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet Lines">
-                    <field colspan="4" name="name" select="2"/>
+                    <field colspan="4" name="name"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/>
                     <field name="date" select="1" on_change="on_change_date(date)"/>
                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
@@ -36,8 +36,8 @@
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
 
                     <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/>
-                    <field name="amount" select="2"/>
-                    <field name="general_account_id" select="2"/>
+                    <field name="amount"/>
+                    <field name="general_account_id"/>
                     <field name="journal_id"/>
                 </form>
             </field>
diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml
index b5f270fe0e8..f0a2d7175b3 100644
--- a/addons/hr_timesheet/hr_timesheet_wizard.xml
+++ b/addons/hr_timesheet/hr_timesheet_wizard.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
-       <!-- <menuitem action="si_so"  id="menu_si_so" parent="hr_attendance.menu_hr_attendance" type="wizard"/>-->
+        <wizard id="si_so" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
+        <menuitem action="si_so"  id="menu_si_so" parent="hr_attendance.menu_hr_time_tracking" type="wizard"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/i18n/ar.po b/addons/hr_timesheet/i18n/ar.po
index 592d9289a7c..b86674b1aa8 100644
--- a/addons/hr_timesheet/i18n/ar.po
+++ b/addons/hr_timesheet/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/bg.po b/addons/hr_timesheet/i18n/bg.po
index 36bb157a6cb..e0e34df38a5 100644
--- a/addons/hr_timesheet/i18n/bg.po
+++ b/addons/hr_timesheet/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/bs.po b/addons/hr_timesheet/i18n/bs.po
index e77637bde04..4cf3b407187 100644
--- a/addons/hr_timesheet/i18n/bs.po
+++ b/addons/hr_timesheet/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/ca.po b/addons/hr_timesheet/i18n/ca.po
index 5bc758263ff..a8737b0bb3d 100644
--- a/addons/hr_timesheet/i18n/ca.po
+++ b/addons/hr_timesheet/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/cs.po b/addons/hr_timesheet/i18n/cs.po
index 7ace8c6aabc..2a631ad72b5 100644
--- a/addons/hr_timesheet/i18n/cs.po
+++ b/addons/hr_timesheet/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index d1c900449bc..c0dc16b4145 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/el.po b/addons/hr_timesheet/i18n/el.po
index 072ca98bbee..21875e550b8 100644
--- a/addons/hr_timesheet/i18n/el.po
+++ b/addons/hr_timesheet/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index 26f74ab60e5..ea3c1e6a1a3 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/es_AR.po b/addons/hr_timesheet/i18n/es_AR.po
index dc2dc025ef8..975b6c8a856 100644
--- a/addons/hr_timesheet/i18n/es_AR.po
+++ b/addons/hr_timesheet/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/et.po b/addons/hr_timesheet/i18n/et.po
index daf8b9b2c1b..a6e418bbc2a 100644
--- a/addons/hr_timesheet/i18n/et.po
+++ b/addons/hr_timesheet/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/fi.po b/addons/hr_timesheet/i18n/fi.po
index 96ae92ba6a9..be5ffd952c4 100644
--- a/addons/hr_timesheet/i18n/fi.po
+++ b/addons/hr_timesheet/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index 0beab6826ab..a004b08089b 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index 592d9289a7c..b86674b1aa8 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/hu.po b/addons/hr_timesheet/i18n/hu.po
index 592d9289a7c..b86674b1aa8 100644
--- a/addons/hr_timesheet/i18n/hu.po
+++ b/addons/hr_timesheet/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/id.po b/addons/hr_timesheet/i18n/id.po
index 2293c74843f..9a04c0781fc 100644
--- a/addons/hr_timesheet/i18n/id.po
+++ b/addons/hr_timesheet/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index f6605404be1..27558ec8de0 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/ko.po b/addons/hr_timesheet/i18n/ko.po
index 4f39888143a..3c03099fc42 100644
--- a/addons/hr_timesheet/i18n/ko.po
+++ b/addons/hr_timesheet/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/lt.po b/addons/hr_timesheet/i18n/lt.po
index 592d9289a7c..b86674b1aa8 100644
--- a/addons/hr_timesheet/i18n/lt.po
+++ b/addons/hr_timesheet/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/lv.po b/addons/hr_timesheet/i18n/lv.po
index ce81bf81ba9..c42405715ec 100644
--- a/addons/hr_timesheet/i18n/lv.po
+++ b/addons/hr_timesheet/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/nl.po b/addons/hr_timesheet/i18n/nl.po
index cf31544f772..eacf58bd10a 100644
--- a/addons/hr_timesheet/i18n/nl.po
+++ b/addons/hr_timesheet/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po
index a8d7792f50c..25e13552267 100644
--- a/addons/hr_timesheet/i18n/pl.po
+++ b/addons/hr_timesheet/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/pt.po b/addons/hr_timesheet/i18n/pt.po
index 1cd88a0726b..dfde1e03082 100644
--- a/addons/hr_timesheet/i18n/pt.po
+++ b/addons/hr_timesheet/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/pt_BR.po b/addons/hr_timesheet/i18n/pt_BR.po
index 0a9b8106e77..28cb7603766 100644
--- a/addons/hr_timesheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/ro.po b/addons/hr_timesheet/i18n/ro.po
index 2d8cabd7a14..aa4b592ec66 100644
--- a/addons/hr_timesheet/i18n/ro.po
+++ b/addons/hr_timesheet/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/ru.po b/addons/hr_timesheet/i18n/ru.po
index faf48091f94..0b75ea226e4 100644
--- a/addons/hr_timesheet/i18n/ru.po
+++ b/addons/hr_timesheet/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sl.po b/addons/hr_timesheet/i18n/sl.po
index a3f250bc9b5..3ee0d79f7cd 100644
--- a/addons/hr_timesheet/i18n/sl.po
+++ b/addons/hr_timesheet/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sq.po b/addons/hr_timesheet/i18n/sq.po
index 702f6d51f73..1c63e5b5005 100644
--- a/addons/hr_timesheet/i18n/sq.po
+++ b/addons/hr_timesheet/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po
index bd2056af036..79db1137442 100644
--- a/addons/hr_timesheet/i18n/sv.po
+++ b/addons/hr_timesheet/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/tlh.po b/addons/hr_timesheet/i18n/tlh.po
index b3da130ba35..a05880de063 100644
--- a/addons/hr_timesheet/i18n/tlh.po
+++ b/addons/hr_timesheet/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index e4dedef8226..3c076d12e8d 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/uk.po b/addons/hr_timesheet/i18n/uk.po
index fa249ad2950..e17cea7b6a5 100644
--- a/addons/hr_timesheet/i18n/uk.po
+++ b/addons/hr_timesheet/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index af8968206f2..357439bd377 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/zh_TW.po b/addons/hr_timesheet/i18n/zh_TW.po
index 9272aa6d7f5..1ee6a76c4ef 100644
--- a/addons/hr_timesheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index c179c3d3fff..9755d2d5871 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -42,24 +42,24 @@ def emp_create_xml(cr, id, som, eom):
         "and line.user_id=%s and line.date >= %s and line.date < %s "
         "order by line.date",
         (id, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
-    
+
     # Sum by day
     month = {}
     for presence in cr.dictfetchall():
         day = int(presence['date'][-2:])
         month[day] = month.get(day, 0.0) + presence['amount']
-    
+
     xml = '''
     <time-element date="%s">
         <amount>%.2f</amount>
     </time-element>
     '''
     time_xml = ([xml % (day, amount) for day, amount in month.iteritems()])
-    
+
     # Computing the employee
     cr.execute("select name from res_users where id=%s", (id,))
     emp = cr.fetchone()[0]
-    
+
     # Computing the xml
     xml = '''
     <employee id="%d" name="%s">
@@ -73,13 +73,13 @@ class report_custom(report_rml):
     def get_month_name(self, cr, uid, month):
         _months = {1:_("January"), 2:_("February"), 3:_("March"), 4:_("April"), 5:_("May"), 6:_("June"), 7:_("July"), 8:_("August"), 9:_("September"), 10:_("October"), 11:_("November"), 12:_("December")}
         return _months[month]
-    
+
     def get_weekday_name(self, cr, uid, weekday):
         _weekdays = {1:_('Mon'), 2:_('Tue'), 3:_('Wed'), 4:_('Thu'), 5:_('Fri'), 6:_('Sat'), 7:_('Sun')}
         return _weekdays[weekday]
 
     def create_xml(self, cr, uid, ids, data, context):
-    
+
         # Computing the dates (start of month: som, and end of month: eom)
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
@@ -87,9 +87,9 @@ class report_custom(report_rml):
         date_xml += ['<day number="%d" name="%s" weekday="%d" />' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1), som.replace(day=x).weekday()+1) for x in range(1, lengthmonth(som.year, som.month)+1)]
         date_xml.append('</days>')
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
-        
+
         emp_xml=''
-        for id in data['form']['user_ids'][0][2]:
+        for id in data['form']['user_ids']:
             emp_xml += emp_create_xml(cr, id, som, eom)
 
         # Computing the xml
diff --git a/addons/hr_timesheet/wizard/__init__.py b/addons/hr_timesheet/wizard/__init__.py
index 88b1cb40415..8619dcbcfea 100644
--- a/addons/hr_timesheet/wizard/__init__.py
+++ b/addons/hr_timesheet/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,13 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import sign_in_out
-import wizard_print_timesheet
-import wizard_print_timesheet_users
+import hr_timesheet_print_employee
+import hr_timesheet_print_users
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
new file mode 100644
index 00000000000..d2e9a54f836
--- /dev/null
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import datetime
+
+from osv import osv, fields
+
+class analytical_timesheet_employee(osv.osv_memory):
+    _name = 'hr.analytical.timesheet.employee'
+    _description = 'Print Employee Timesheet & Print My Timesheet'
+    _columns = {
+        'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
+                                  'Month', required=True),
+        'year': fields.integer('Year', required=True),
+        'user_id': fields.many2one('res.users', 'User', required=True)
+                }
+
+    def _get_user(self, cr, uid, context=None):
+        return uid
+
+    _defaults = {
+         'month': datetime.date.today().month,
+         'year': datetime.date.today().year,
+         'user_id': _get_user
+             }
+
+    def print_report(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, context=context)[0]
+        datas = {
+             'ids': [],
+             'model': 'hr.employee',
+             'form': data
+                 }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'hr.analytical.timesheet',
+            'datas': datas,
+            }
+analytical_timesheet_employee()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
new file mode 100644
index 00000000000..a3b53a05d22
--- /dev/null
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<!-- Print Employee Timesheet -->
+    	<record id="view_hr_timesheet_employee" model="ir.ui.view">
+            <field name="name">hr.analytical.timesheet.employee.form</field>
+            <field name="model">hr.analytical.timesheet.employee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employee Timesheet">
+                	<group colspan="4" >
+	                	<field name="month" />
+	                	<field name="year" />
+	                	<field name="user_id" colspan="3" />
+                	</group>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_hr_timesheet_employee" model="ir.actions.act_window">
+            <field name="name">Employee Timesheet</field>
+            <field name="res_model">hr.analytical.timesheet.employee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_hr_timesheet_employee"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_hr_timesheet_employee"
+        	id="menu_hr_timesheet_employee"
+        	parent="menu_hr_reporting_timesheet"
+        	groups="hr.group_hr_manager" />
+
+
+      <!-- Print My Timesheet -->
+      <record id="view_hr_timesheet_my" model="ir.ui.view">
+            <field name="name">hr.analytical.timesheet.my.form</field>
+            <field name="model">hr.analytical.timesheet.employee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Print My Timesheet">
+                	<group colspan="4" >
+	                	<field name="month" />
+	                	<field name="year" />
+	                	<field name="user_id" colspan="3" readonly="1" />
+                	</group>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_hr_timesheet_my" model="ir.actions.act_window">
+            <field name="name">Print My Timesheet</field>
+            <field name="res_model">hr.analytical.timesheet.employee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_hr_timesheet_my"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_hr_timesheet_my"
+        	id="menu_hr_timesheet_my"
+        	parent="menu_hr_reporting_timesheet"
+        	groups="hr.group_hr_user" />
+
+    </data>
+</openerp>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
new file mode 100644
index 00000000000..3931e41e185
--- /dev/null
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import datetime
+
+from osv import osv, fields
+
+class analytical_timesheet_employees(osv.osv_memory):
+    _name = 'hr.analytical.timesheet.users'
+    _description = 'Print Employees Timesheet'
+    _columns = {
+        'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
+                                  'Month', required=True),
+        'year': fields.integer('Year', required=True),
+        'user_ids': fields.many2many('res.users', 'timesheet_users_rel', 'timesheet_id', 'user_id', 'Users', required=True)
+                }
+
+    _defaults = {
+         'month': datetime.date.today().month,
+         'year': datetime.date.today().year,
+             }
+
+    def print_report(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, context=context)[0]
+        datas = {
+             'ids': [],
+             'model': 'hr.employee',
+             'form': data
+                 }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'hr.analytical.timesheet_users',
+            'datas': datas,
+            }
+
+analytical_timesheet_employees()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
new file mode 100644
index 00000000000..4e12f4f2333
--- /dev/null
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+		<!-- Print Employees Timesheets -->
+    	<record id="view_hr_timesheet_users" model="ir.ui.view">
+            <field name="name">hr.analytical.timesheet.users.form</field>
+            <field name="model">hr.analytical.timesheet.users</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Employees Timesheet">
+                	<group colspan="4" >
+	                	<field name="month" />
+	                	<field name="year" />
+	                	<field name="user_ids" colspan="3" />
+                	</group>
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_hr_timesheet_users" model="ir.actions.act_window">
+            <field name="name">Employees Timesheet</field>
+            <field name="res_model">hr.analytical.timesheet.users</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_hr_timesheet_users"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_hr_timesheet_users"
+        	id="menu_hr_timesheet_users"
+        	parent="menu_hr_reporting_timesheet"
+        	groups="hr.group_hr_manager" />
+
+
+     </data>
+</openerp>
diff --git a/addons/hr_timesheet/wizard/sign_in_out.py b/addons/hr_timesheet/wizard/sign_in_out.py
index 4aea035f829..ff532afc260 100644
--- a/addons/hr_timesheet/wizard/sign_in_out.py
+++ b/addons/hr_timesheet/wizard/sign_in_out.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@ import time
 import pooler
 from tools.translate import _
 
-si_form ='''<?xml version="1.0"?> 
+si_form ='''<?xml version="1.0"?>
 <form string="Sign in / Sign out">
     <separator string="Sign in" colspan="4"/>
     <field name="name" readonly="True" />
@@ -98,6 +98,7 @@ def _sign_in_result(self, cr, uid, data, context):
 
 def _write(self, cr, uid, data, emp_id, context):
     timesheet_obj = pooler.get_pool(cr.dbname).get('hr.analytic.timesheet')
+    emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')
     hour = (time.mktime(time.strptime(data['form']['date'] or time.strftime('%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S')) -
         time.mktime(time.strptime(data['form']['date_start'], '%Y-%m-%d %H:%M:%S'))) / 3600.0
     minimum = data['form']['analytic_amount']
@@ -110,6 +111,8 @@ def _write(self, cr, uid, data, emp_id, context):
     res['name'] = data['form']['info']
     res['account_id'] = data['form']['account_id']
     res['unit_amount'] = hour
+    emp_journal = emp_obj.browse(cr, uid, emp_id, context).journal_id
+    res['journal_id'] = emp_journal and emp_journal.id or False
     res.update(up)
     up = timesheet_obj.on_change_account_id(cr, uid, [], res['account_id']).get('value', {})
     res.update(up)
diff --git a/addons/hr_timesheet/wizard/wizard_print_timesheet.py b/addons/hr_timesheet/wizard/wizard_print_timesheet.py
deleted file mode 100644
index ba11d301762..00000000000
--- a/addons/hr_timesheet/wizard/wizard_print_timesheet.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import datetime
-
-import wizard
-import netsvc
-
-dates_form = '''<?xml version="1.0"?>
-<form string="Choose your month">
-    <field name="month" />
-    <field name="year" />
-    <field name="user_id" colspan="3" />
-</form>'''
-
-
-dates_form_ro = '''<?xml version="1.0"?>
-<form string="Choose your month">
-    <field name="month" />
-    <field name="year" />
-    <field name="user_id" colspan="3" readonly="1"/>
-</form>'''
-
-dates_fields = {
-    'month': dict(string=u'Month', type='selection', required=True, selection=[(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)]),
-    'year': dict(string=u'Year', type=u'integer', required=True),
-    'user_id' : dict(string=u'User', type='many2one', relation='res.users', required=True),
-}
-
-def _get_value(self, cr, uid, data, context):
-    today = datetime.date.today()
-    return dict(month=today.month, year=today.year, user_id=uid)
-
-class wizard_report(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_value], 
-            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[ ('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-        },
-        'report': {
-            'actions': [],
-            'result': {'type':'print', 'report':'hr.analytical.timesheet', 'state':'end'}
-        }
-    }
-wizard_report('hr.analytical.timesheet')
-
-class wizard_report_my(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_value], 
-            'result': {'type':'form', 'arch':dates_form_ro, 'fields':dates_fields, 'state':[ ('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-        },
-        'report': {
-            'actions': [],
-            'result': {'type':'print', 'report':'hr.analytical.timesheet', 'state':'end'}
-        }
-    }
-wizard_report_my('hr.analytical.timesheet.my')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py b/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py
deleted file mode 100644
index a00ddd00084..00000000000
--- a/addons/hr_timesheet/wizard/wizard_print_timesheet_users.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import datetime
-
-form='''<?xml version="1.0"?>
-<form string="Choose Users">
-    <field name="month"/>
-    <field name="year"/>
-    <field name="user_ids" colspan="3"/>
-</form>'''
-
-fields = {
-    'month': dict(string=u'Month', type='selection', required=True, selection=[(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)]), 
-    'year': dict(string=u'Year', type='integer', required=True),
-    'user_ids': dict(string=u'Users', type='many2many', relation='res.users', required=True),
-}
-
-def _get_value(self, cr, uid, data, context):
-    today=datetime.date.today()
-    return dict(month=today.month, year=today.year)
-
-class wizard_report(wizard.interface):
-    states={
-        'init':{
-            'actions':[_get_value],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-        },
-        'report':{
-            'actions':[],
-            'result':{'type':'print', 'report':'hr.analytical.timesheet_users', 'state':'end'}
-        }
-    }
-wizard_report('hr.analytical.timesheet_users')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_timesheet_invoice/__terp__.py b/addons/hr_timesheet_invoice/__openerp__.py
similarity index 100%
rename from addons/hr_timesheet_invoice/__terp__.py
rename to addons/hr_timesheet_invoice/__openerp__.py
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 1e432fea9e1..a603cc3f24e 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -27,8 +27,8 @@
             <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="company_currency_id" select="2" position="replace">
-                    <field name="currency_id" select="2"/>
+                <field name="company_currency_id" position="replace">
+                    <field name="currency_id"/>
                 </field>
             </field>
         </record>
@@ -40,7 +40,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="journal_id" position="after">
-                    <field name="to_invoice" select="2"/>
+                    <field name="to_invoice"/>
                     <field name="invoice_id"/>
                 </field>
             </field>
@@ -154,7 +154,7 @@
             <field name="arch" type="xml">
                 <form string="Type of invoicing">
                     <field colspan="1" name="name" select="1"/>
-                    <field colspan="1" name="customer_name" select="2"/>
+                    <field colspan="1" name="customer_name"/>
                     <field colspan="2" name="factor"/>
                 </form>
             </field>
diff --git a/addons/hr_timesheet_invoice/i18n/ar.po b/addons/hr_timesheet_invoice/i18n/ar.po
index 783acbc5692..3891403d0c1 100644
--- a/addons/hr_timesheet_invoice/i18n/ar.po
+++ b/addons/hr_timesheet_invoice/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/bg.po b/addons/hr_timesheet_invoice/i18n/bg.po
index e100df3796e..4586ab027cf 100644
--- a/addons/hr_timesheet_invoice/i18n/bg.po
+++ b/addons/hr_timesheet_invoice/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/bs.po b/addons/hr_timesheet_invoice/i18n/bs.po
index 9ba73c10d93..1d73a1d3e34 100644
--- a/addons/hr_timesheet_invoice/i18n/bs.po
+++ b/addons/hr_timesheet_invoice/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/ca.po b/addons/hr_timesheet_invoice/i18n/ca.po
index 8445c039a28..ae922af36ca 100644
--- a/addons/hr_timesheet_invoice/i18n/ca.po
+++ b/addons/hr_timesheet_invoice/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/cs.po b/addons/hr_timesheet_invoice/i18n/cs.po
index 71507f404ec..a485692b099 100644
--- a/addons/hr_timesheet_invoice/i18n/cs.po
+++ b/addons/hr_timesheet_invoice/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index b2b259a917e..c406068a34e 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/el.po b/addons/hr_timesheet_invoice/i18n/el.po
index bcf9cece41e..f6f25ca88a3 100644
--- a/addons/hr_timesheet_invoice/i18n/el.po
+++ b/addons/hr_timesheet_invoice/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index ce41396de61..0fe466b9510 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/es_AR.po b/addons/hr_timesheet_invoice/i18n/es_AR.po
index 9198521eed0..76ce70b1c00 100644
--- a/addons/hr_timesheet_invoice/i18n/es_AR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/et.po b/addons/hr_timesheet_invoice/i18n/et.po
index 4fe6f5e8493..56b808050b8 100644
--- a/addons/hr_timesheet_invoice/i18n/et.po
+++ b/addons/hr_timesheet_invoice/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/fi.po b/addons/hr_timesheet_invoice/i18n/fi.po
index 1759017a8d5..9dc674cc892 100644
--- a/addons/hr_timesheet_invoice/i18n/fi.po
+++ b/addons/hr_timesheet_invoice/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index 987f32075e4..14e8e39aa59 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/hr.po b/addons/hr_timesheet_invoice/i18n/hr.po
index 783acbc5692..3891403d0c1 100644
--- a/addons/hr_timesheet_invoice/i18n/hr.po
+++ b/addons/hr_timesheet_invoice/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/hu.po b/addons/hr_timesheet_invoice/i18n/hu.po
index 783acbc5692..3891403d0c1 100644
--- a/addons/hr_timesheet_invoice/i18n/hu.po
+++ b/addons/hr_timesheet_invoice/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/id.po b/addons/hr_timesheet_invoice/i18n/id.po
index 66d0e19a802..8f17b6b8b51 100644
--- a/addons/hr_timesheet_invoice/i18n/id.po
+++ b/addons/hr_timesheet_invoice/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index 4146d6b0887..360ea0732f4 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/ko.po b/addons/hr_timesheet_invoice/i18n/ko.po
index ddca67ed31b..d921f62b37c 100644
--- a/addons/hr_timesheet_invoice/i18n/ko.po
+++ b/addons/hr_timesheet_invoice/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/lt.po b/addons/hr_timesheet_invoice/i18n/lt.po
index 783acbc5692..3891403d0c1 100644
--- a/addons/hr_timesheet_invoice/i18n/lt.po
+++ b/addons/hr_timesheet_invoice/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/lv.po b/addons/hr_timesheet_invoice/i18n/lv.po
index 963b9abc67a..0146eeeede0 100644
--- a/addons/hr_timesheet_invoice/i18n/lv.po
+++ b/addons/hr_timesheet_invoice/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/nl.po b/addons/hr_timesheet_invoice/i18n/nl.po
index 85ed869ad4e..ce1426f5ea7 100644
--- a/addons/hr_timesheet_invoice/i18n/nl.po
+++ b/addons/hr_timesheet_invoice/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/nl_BE.po b/addons/hr_timesheet_invoice/i18n/nl_BE.po
index eb86586929a..48af6f1120a 100644
--- a/addons/hr_timesheet_invoice/i18n/nl_BE.po
+++ b/addons/hr_timesheet_invoice/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 14de3bbd0b1..03cc490b8ca 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/pt.po b/addons/hr_timesheet_invoice/i18n/pt.po
index 8803138f112..48ba06b0bb3 100644
--- a/addons/hr_timesheet_invoice/i18n/pt.po
+++ b/addons/hr_timesheet_invoice/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/pt_BR.po b/addons/hr_timesheet_invoice/i18n/pt_BR.po
index f4a17d8c0a0..289067c4e43 100644
--- a/addons/hr_timesheet_invoice/i18n/pt_BR.po
+++ b/addons/hr_timesheet_invoice/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/ro.po b/addons/hr_timesheet_invoice/i18n/ro.po
index adf4a837553..fd04dcd91f0 100644
--- a/addons/hr_timesheet_invoice/i18n/ro.po
+++ b/addons/hr_timesheet_invoice/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/ru.po b/addons/hr_timesheet_invoice/i18n/ru.po
index d92670e526b..8a3872aa66c 100644
--- a/addons/hr_timesheet_invoice/i18n/ru.po
+++ b/addons/hr_timesheet_invoice/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index b9eb783468a..9890a9b974a 100644
--- a/addons/hr_timesheet_invoice/i18n/sl.po
+++ b/addons/hr_timesheet_invoice/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index 5c43034977e..9588fdbc01d 100644
--- a/addons/hr_timesheet_invoice/i18n/sv.po
+++ b/addons/hr_timesheet_invoice/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/tlh.po b/addons/hr_timesheet_invoice/i18n/tlh.po
index 4b568d04d39..cd3dfe946ca 100644
--- a/addons/hr_timesheet_invoice/i18n/tlh.po
+++ b/addons/hr_timesheet_invoice/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index 07d30419aa2..cc37ec71823 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/uk.po b/addons/hr_timesheet_invoice/i18n/uk.po
index 0e6f32ecd4f..2a01ce2624a 100644
--- a/addons/hr_timesheet_invoice/i18n/uk.po
+++ b/addons/hr_timesheet_invoice/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index 47b7fc426c4..86748659898 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/zh_TW.po b/addons/hr_timesheet_invoice/i18n/zh_TW.po
index 902c6471d97..8b2f672e975 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_TW.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index ac575a625e4..7e5edca5474 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -193,7 +193,7 @@ class invoice_create(wizard.interface):
     _create_form = """<?xml version="1.0"?>
     <form string="Invoice on analytic entries">
         <notebook>
-        <page string="Invoicing Data">
+        <page string="Billing Data">
             <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
             <field name="date"/>
             <field name="time"/>
diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__openerp__.py
similarity index 100%
rename from addons/hr_timesheet_sheet/__terp__.py
rename to addons/hr_timesheet_sheet/__openerp__.py
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d04571fcfe2..81b86fecfa6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -30,7 +30,7 @@
                     <field name="sheet_id" select="1"/>
                     <field name="name" select="1"/>
                     <field name="total" sum="Total"/>
-                    <field name="invoice_rate" select="2"/>
+                    <field name="invoice_rate"/>
                 </form>
             </field>
         </record>
@@ -280,7 +280,7 @@
             <field name="inherit_id" ref="hr_attendance.view_attendance_form"/>
             <field name="arch" type="xml">
                 <field name="action_desc" position="after">
-                    <field name="sheet_id" select="2"/>
+                    <field name="sheet_id"/>
                 </field>
             </field>
         </record>
@@ -332,5 +332,8 @@
             </field>
         </record>
 
+	<!-- Timesheet Button on Employee Form -->
+	<act_window domain="[('user_id', '=', user_id)]" id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/i18n/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po
index 2da7db718b8..b953a2fcac9 100644
--- a/addons/hr_timesheet_sheet/i18n/ar.po
+++ b/addons/hr_timesheet_sheet/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po
index 63d4825902d..3c217a5df6b 100644
--- a/addons/hr_timesheet_sheet/i18n/bg.po
+++ b/addons/hr_timesheet_sheet/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po
index ce6c34d9b65..ede11c8f1cb 100644
--- a/addons/hr_timesheet_sheet/i18n/bs.po
+++ b/addons/hr_timesheet_sheet/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index 783bf7cb6b0..9712f579509 100644
--- a/addons/hr_timesheet_sheet/i18n/ca.po
+++ b/addons/hr_timesheet_sheet/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index f5db2d676d3..5804edbedb0 100644
--- a/addons/hr_timesheet_sheet/i18n/cs.po
+++ b/addons/hr_timesheet_sheet/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index 9c735dbfbeb..c396f3e8d8f 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index cb90aa414b5..abf231891aa 100644
--- a/addons/hr_timesheet_sheet/i18n/el.po
+++ b/addons/hr_timesheet_sheet/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index 60d1e3ed199..6008b96c259 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po
index e11be30b528..88e6fbaa6d4 100644
--- a/addons/hr_timesheet_sheet/i18n/es_AR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index 242e8611254..26ad11ba24d 100644
--- a/addons/hr_timesheet_sheet/i18n/et.po
+++ b/addons/hr_timesheet_sheet/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index c4c788d00de..5593704324e 100644
--- a/addons/hr_timesheet_sheet/i18n/fi.po
+++ b/addons/hr_timesheet_sheet/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index 7a9536a9612..e4228841bba 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index 2da7db718b8..b953a2fcac9 100644
--- a/addons/hr_timesheet_sheet/i18n/hr.po
+++ b/addons/hr_timesheet_sheet/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po
index 2da7db718b8..b953a2fcac9 100644
--- a/addons/hr_timesheet_sheet/i18n/hu.po
+++ b/addons/hr_timesheet_sheet/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po
index 60af8043398..384e9d556eb 100644
--- a/addons/hr_timesheet_sheet/i18n/id.po
+++ b/addons/hr_timesheet_sheet/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index 03cc6908c1d..36d6b9a35a2 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po
index c84ad0e4f65..49423805ad0 100644
--- a/addons/hr_timesheet_sheet/i18n/ko.po
+++ b/addons/hr_timesheet_sheet/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 54f58f4a8fc..848d070d57d 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po
index 3a93323fb08..f3a92a17d6c 100644
--- a/addons/hr_timesheet_sheet/i18n/lv.po
+++ b/addons/hr_timesheet_sheet/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po
index c74fc5f3663..9d46f4c0e4d 100644
--- a/addons/hr_timesheet_sheet/i18n/nl.po
+++ b/addons/hr_timesheet_sheet/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po
index ef9c75b10cd..2554a7f1ab8 100644
--- a/addons/hr_timesheet_sheet/i18n/nl_BE.po
+++ b/addons/hr_timesheet_sheet/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index 3d418926b85..8df3f40f7de 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po
index 2493301c85d..b7059bea8be 100644
--- a/addons/hr_timesheet_sheet/i18n/pt.po
+++ b/addons/hr_timesheet_sheet/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index 088f4fa5849..466386c1c78 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po
index 2da7db718b8..b953a2fcac9 100644
--- a/addons/hr_timesheet_sheet/i18n/ro.po
+++ b/addons/hr_timesheet_sheet/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po
index 656d5f5abc7..a68d42d5927 100644
--- a/addons/hr_timesheet_sheet/i18n/ru.po
+++ b/addons/hr_timesheet_sheet/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index 6602fc1a089..f5d7ed0872c 100644
--- a/addons/hr_timesheet_sheet/i18n/sl.po
+++ b/addons/hr_timesheet_sheet/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index 44719e9f4f4..5832df4ab6a 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po
index 10f2bc018c9..4b1064a6781 100644
--- a/addons/hr_timesheet_sheet/i18n/tlh.po
+++ b/addons/hr_timesheet_sheet/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+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 f7ab209d444..2bcec9bf914 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po
index 5fe3756d8b1..bbb7aeb6a37 100644
--- a/addons/hr_timesheet_sheet/i18n/uk.po
+++ b/addons/hr_timesheet_sheet/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index db4896a48c2..d36dcebf940 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po
index 49507ae8712..02435951dde 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index 9e2d87c55c3..9db13474ee0 100755
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -144,7 +144,7 @@
         <record id="process_transition_invoiceontimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Invoicing&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Billing&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The invoice is created based on the timesheet.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceonwork0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
@@ -185,4 +185,4 @@
         </record>
         
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/html_view/__terp__.py b/addons/html_view/__openerp__.py
similarity index 100%
rename from addons/html_view/__terp__.py
rename to addons/html_view/__openerp__.py
diff --git a/addons/idea/__terp__.py b/addons/idea/__openerp__.py
similarity index 100%
rename from addons/idea/__terp__.py
rename to addons/idea/__openerp__.py
diff --git a/addons/idea/i18n/ar.po b/addons/idea/i18n/ar.po
index 128811d298d..89855009145 100644
--- a/addons/idea/i18n/ar.po
+++ b/addons/idea/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/bg.po b/addons/idea/i18n/bg.po
index c41313b0c4d..deae0d26e65 100644
--- a/addons/idea/i18n/bg.po
+++ b/addons/idea/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/bs.po b/addons/idea/i18n/bs.po
index 29cb31b95e5..8fa9afd73c7 100644
--- a/addons/idea/i18n/bs.po
+++ b/addons/idea/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/ca.po b/addons/idea/i18n/ca.po
index b314b62bf60..e0851252c89 100644
--- a/addons/idea/i18n/ca.po
+++ b/addons/idea/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/cs.po b/addons/idea/i18n/cs.po
index 84c920f5366..567fe426c6e 100644
--- a/addons/idea/i18n/cs.po
+++ b/addons/idea/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/de.po b/addons/idea/i18n/de.po
index 5d8b9b018f8..e81b86f2b88 100644
--- a/addons/idea/i18n/de.po
+++ b/addons/idea/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/el.po b/addons/idea/i18n/el.po
index 241e5628397..f31b4662ebb 100644
--- a/addons/idea/i18n/el.po
+++ b/addons/idea/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/es.po b/addons/idea/i18n/es.po
index 7e6da2e7a06..d6429a57e62 100644
--- a/addons/idea/i18n/es.po
+++ b/addons/idea/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/es_AR.po b/addons/idea/i18n/es_AR.po
index c7aac5d92aa..9e2bdb53b32 100644
--- a/addons/idea/i18n/es_AR.po
+++ b/addons/idea/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/et.po b/addons/idea/i18n/et.po
index eb2813d37e1..ccee4cb767e 100644
--- a/addons/idea/i18n/et.po
+++ b/addons/idea/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/fi.po b/addons/idea/i18n/fi.po
index 0d364d1f373..51a095fa2e7 100644
--- a/addons/idea/i18n/fi.po
+++ b/addons/idea/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/fr.po b/addons/idea/i18n/fr.po
index c763380b653..69ed3359807 100644
--- a/addons/idea/i18n/fr.po
+++ b/addons/idea/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/hr.po b/addons/idea/i18n/hr.po
index 30f63529cbf..9083bd8d0aa 100644
--- a/addons/idea/i18n/hr.po
+++ b/addons/idea/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/idea/i18n/hu.po b/addons/idea/i18n/hu.po
index c946b0b2e71..897962a2c47 100644
--- a/addons/idea/i18n/hu.po
+++ b/addons/idea/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/id.po b/addons/idea/i18n/id.po
index 39ea2324830..190156f359b 100644
--- a/addons/idea/i18n/id.po
+++ b/addons/idea/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/it.po b/addons/idea/i18n/it.po
index 8d30f9d7421..c61b98bedeb 100644
--- a/addons/idea/i18n/it.po
+++ b/addons/idea/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/ko.po b/addons/idea/i18n/ko.po
index 65cbd005492..54a433c1fc4 100644
--- a/addons/idea/i18n/ko.po
+++ b/addons/idea/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/lt.po b/addons/idea/i18n/lt.po
index edc405512bd..929cb2114da 100644
--- a/addons/idea/i18n/lt.po
+++ b/addons/idea/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/nl.po b/addons/idea/i18n/nl.po
index 9772b25c1cc..8f384cba6bd 100644
--- a/addons/idea/i18n/nl.po
+++ b/addons/idea/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/pl.po b/addons/idea/i18n/pl.po
index ecef5d063f9..0471ee6f269 100644
--- a/addons/idea/i18n/pl.po
+++ b/addons/idea/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/pt.po b/addons/idea/i18n/pt.po
index 10ffb5ad410..236a76405cd 100644
--- a/addons/idea/i18n/pt.po
+++ b/addons/idea/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/pt_BR.po b/addons/idea/i18n/pt_BR.po
index 3e76f32db8e..a371b24ac69 100644
--- a/addons/idea/i18n/pt_BR.po
+++ b/addons/idea/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/ro.po b/addons/idea/i18n/ro.po
index a544481ca25..ab70acd8740 100644
--- a/addons/idea/i18n/ro.po
+++ b/addons/idea/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/ru.po b/addons/idea/i18n/ru.po
index 9f8622ada30..7d8491e2d05 100644
--- a/addons/idea/i18n/ru.po
+++ b/addons/idea/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/sk.po b/addons/idea/i18n/sk.po
index 90576dd27c9..891f537d60d 100644
--- a/addons/idea/i18n/sk.po
+++ b/addons/idea/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/sl.po b/addons/idea/i18n/sl.po
index 083bc2b5d0e..74c2219a950 100644
--- a/addons/idea/i18n/sl.po
+++ b/addons/idea/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/sv.po b/addons/idea/i18n/sv.po
index ac5c1717539..383d4c410a9 100644
--- a/addons/idea/i18n/sv.po
+++ b/addons/idea/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/tlh.po b/addons/idea/i18n/tlh.po
index 2c63662a8b6..0c69626ac02 100644
--- a/addons/idea/i18n/tlh.po
+++ b/addons/idea/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/tr.po b/addons/idea/i18n/tr.po
index 45aa863cb4b..8e0e9b90487 100644
--- a/addons/idea/i18n/tr.po
+++ b/addons/idea/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/uk.po b/addons/idea/i18n/uk.po
index ed8d301780a..91a324536d0 100644
--- a/addons/idea/i18n/uk.po
+++ b/addons/idea/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+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 8544f1cc65a..c71a346c7db 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/zh_TW.po b/addons/idea/i18n/zh_TW.po
index ce2bc191f16..1004e3224fe 100644
--- a/addons/idea/i18n/zh_TW.po
+++ b/addons/idea/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 9dad176d524..7dc0b5f7178 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -14,7 +14,7 @@
                     <field name="name" select="1"/>
                     <field name="parent_id" select="1"/>
                     <newline/>
-                    <field name="summary" select="2" colspan="4"/>
+                    <field name="summary" colspan="4"/>
                 </form>
             </field>
         </record>
@@ -124,7 +124,7 @@
         <form string="Votes">
             <field name="idea_id" select="1" />
             <field name="user_id" select="1" />
-            <field name="score" select="2"/>
+            <field name="score"/>
         </form>
         </field>
     </record>
@@ -143,8 +143,8 @@
                     <field name="category_id" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="vote_avg" />
-                    <field name="description" colspan="4" select="2" widget="text_wiki"/>
-                    <field name="state" select="2"/>
+                    <field name="description" colspan="4" widget="text_wiki"/>
+                    <field name="state"/>
                     <group colspan="2" col="3">
                         <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
                         <button name="idea_close" string="Close" states="open" icon="gtk-close"/>
@@ -286,7 +286,7 @@
                 <form string="vote_stat of ideas">
                     <field name="idea_id" select="1"/>
                     <field name="score"  select="1"/>
-                    <field name="nbr"  select="2"/>
+                    <field name="nbr" />
                 </form>
             </field>
         </record>
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index f76dd1aa562..c5e6c530334 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 
 class idea_post_vote(osv.osv_memory):
     """ Post Vote For Idea """
@@ -35,6 +36,27 @@ class idea_post_vote(osv.osv_memory):
                                           ('75', 'Good'),
                                           ('100', 'Very Good') ], 'Post Vote', required=True)
                 }
+    
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+        """
+        idea_obj = self.pool.get('idea.idea')
+
+        for idea in idea_obj.browse(cr, uid, context.get('active_ids', [])):
+            if idea.state in ['draft', 'close', 'cancel']:
+                raise osv.except_osv(_("Warning !"), _("Draft/Accepted/Cancelled \
+ideas Could not be voted"))
+            if idea.state != 'open':
+                raise osv.except_osv(_('Warning !'), _('idea should be in \
+\'Open\' state before vote for that idea.'))
+        return False
+
 
     def do_vote(self, cr, uid, ids, context):
 
@@ -52,6 +74,7 @@ class idea_post_vote(osv.osv_memory):
         for do_vote_obj in self.read(cr, uid, ids):
             score = str(do_vote_obj['vote'])
             dic = {'idea_id': data, 'user_id': uid, 'score': score }
+            
             vote = vote_obj.create(cr, uid, dic)
             return {}
 
diff --git a/addons/knowledge/__terp__.py b/addons/knowledge/__openerp__.py
similarity index 100%
rename from addons/knowledge/__terp__.py
rename to addons/knowledge/__openerp__.py
diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__openerp__.py
similarity index 100%
rename from addons/l10n_be/__terp__.py
rename to addons/l10n_be/__openerp__.py
diff --git a/addons/l10n_be/i18n/ar.po b/addons/l10n_be/i18n/ar.po
index 043499279bf..f92e54c8d3f 100644
--- a/addons/l10n_be/i18n/ar.po
+++ b/addons/l10n_be/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/bg.po b/addons/l10n_be/i18n/bg.po
index 3f7539f3fdd..37e279e852f 100644
--- a/addons/l10n_be/i18n/bg.po
+++ b/addons/l10n_be/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/bs.po b/addons/l10n_be/i18n/bs.po
index 32f2abc702b..1cf3293ff0b 100644
--- a/addons/l10n_be/i18n/bs.po
+++ b/addons/l10n_be/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/ca.po b/addons/l10n_be/i18n/ca.po
index 551041af39c..c907936c4a6 100644
--- a/addons/l10n_be/i18n/ca.po
+++ b/addons/l10n_be/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/cs.po b/addons/l10n_be/i18n/cs.po
index 5b7e165f79c..c74149cc3ce 100644
--- a/addons/l10n_be/i18n/cs.po
+++ b/addons/l10n_be/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/de.po b/addons/l10n_be/i18n/de.po
index 58a15e7e8d7..2019309621c 100644
--- a/addons/l10n_be/i18n/de.po
+++ b/addons/l10n_be/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index 6ca628bed53..9754c7a57da 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/es_AR.po b/addons/l10n_be/i18n/es_AR.po
index a2a5ceb975d..8c3ae9742a2 100644
--- a/addons/l10n_be/i18n/es_AR.po
+++ b/addons/l10n_be/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/et.po b/addons/l10n_be/i18n/et.po
index 2f9957fbafb..4cafcbe071b 100644
--- a/addons/l10n_be/i18n/et.po
+++ b/addons/l10n_be/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/fr.po b/addons/l10n_be/i18n/fr.po
index fe03b69af90..48faf66600e 100644
--- a/addons/l10n_be/i18n/fr.po
+++ b/addons/l10n_be/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/hr.po b/addons/l10n_be/i18n/hr.po
index c7f95bbe2e1..b81b5975aa7 100644
--- a/addons/l10n_be/i18n/hr.po
+++ b/addons/l10n_be/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/hu.po b/addons/l10n_be/i18n/hu.po
index 043499279bf..f92e54c8d3f 100644
--- a/addons/l10n_be/i18n/hu.po
+++ b/addons/l10n_be/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/id.po b/addons/l10n_be/i18n/id.po
index fd866de0367..f28242c0d81 100644
--- a/addons/l10n_be/i18n/id.po
+++ b/addons/l10n_be/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/it.po b/addons/l10n_be/i18n/it.po
index b71fa907024..3e82a8288b0 100644
--- a/addons/l10n_be/i18n/it.po
+++ b/addons/l10n_be/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/ko.po b/addons/l10n_be/i18n/ko.po
index c35cde86cd0..c3c9a69660a 100644
--- a/addons/l10n_be/i18n/ko.po
+++ b/addons/l10n_be/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/lt.po b/addons/l10n_be/i18n/lt.po
index 043499279bf..f92e54c8d3f 100644
--- a/addons/l10n_be/i18n/lt.po
+++ b/addons/l10n_be/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/nl.po b/addons/l10n_be/i18n/nl.po
index e223b712993..383bca0cfdc 100644
--- a/addons/l10n_be/i18n/nl.po
+++ b/addons/l10n_be/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/nl_BE.po b/addons/l10n_be/i18n/nl_BE.po
index 303432cc362..754bd8f9a86 100644
--- a/addons/l10n_be/i18n/nl_BE.po
+++ b/addons/l10n_be/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/pl.po b/addons/l10n_be/i18n/pl.po
index 043499279bf..f92e54c8d3f 100644
--- a/addons/l10n_be/i18n/pl.po
+++ b/addons/l10n_be/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/pt.po b/addons/l10n_be/i18n/pt.po
index 0db393528b6..12cb3060894 100644
--- a/addons/l10n_be/i18n/pt.po
+++ b/addons/l10n_be/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/pt_BR.po b/addons/l10n_be/i18n/pt_BR.po
index cfdf79539d6..a1c1429c1da 100644
--- a/addons/l10n_be/i18n/pt_BR.po
+++ b/addons/l10n_be/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/ro.po b/addons/l10n_be/i18n/ro.po
index 043499279bf..f92e54c8d3f 100644
--- a/addons/l10n_be/i18n/ro.po
+++ b/addons/l10n_be/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/ru.po b/addons/l10n_be/i18n/ru.po
index 495f8f24506..aa1849da62c 100644
--- a/addons/l10n_be/i18n/ru.po
+++ b/addons/l10n_be/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/sl.po b/addons/l10n_be/i18n/sl.po
index 9b0a0a901b7..3e63c8c3f9e 100644
--- a/addons/l10n_be/i18n/sl.po
+++ b/addons/l10n_be/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/sv.po b/addons/l10n_be/i18n/sv.po
index be7f9ca789e..c4a2d355efd 100644
--- a/addons/l10n_be/i18n/sv.po
+++ b/addons/l10n_be/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/tlh.po b/addons/l10n_be/i18n/tlh.po
index 6d41ee1679e..8d9caa49ed8 100644
--- a/addons/l10n_be/i18n/tlh.po
+++ b/addons/l10n_be/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index f0a9d98e258..e19cd396711 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/uk.po b/addons/l10n_be/i18n/uk.po
index 89252a04713..6dae967bb72 100644
--- a/addons/l10n_be/i18n/uk.po
+++ b/addons/l10n_be/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/zh_CN.po b/addons/l10n_be/i18n/zh_CN.po
index e6ae229c6dd..4c340185ff2 100644
--- a/addons/l10n_be/i18n/zh_CN.po
+++ b/addons/l10n_be/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/zh_TW.po b/addons/l10n_be/i18n/zh_TW.po
index f5ee1b03848..f1ebf93fd23 100644
--- a/addons/l10n_be/i18n/zh_TW.po
+++ b/addons/l10n_be/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index 317effd19b7..0e691260425 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -4,6 +4,7 @@
 
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
+        <field name="restart">onskip</field>
     </record>
 
     </data>
diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__openerp__.py
similarity index 100%
rename from addons/l10n_ch/__terp__.py
rename to addons/l10n_ch/__openerp__.py
diff --git a/addons/l10n_ch/account_invoice.xml b/addons/l10n_ch/account_invoice.xml
index ddce598627c..e6602e686f8 100755
--- a/addons/l10n_ch/account_invoice.xml
+++ b/addons/l10n_ch/account_invoice.xml
@@ -23,7 +23,7 @@
             <field name="priority" eval="18"/>
             <field name="arch" type="xml">
                 <field name="partner_bank" position="replace">
-                    <field name="partner_bank" select="2"
+                    <field name="partner_bank"
                         domain="[('partner_id', '=', partner_id)]"
                         on_change="onchange_partner_bank(partner_bank)"/>
                 </field>
@@ -36,10 +36,10 @@
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <field name="partner_bank" position="replace">
-                    <field name="partner_bank" select="2"
+                    <field name="partner_bank"
                         domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
                 </field>
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_ch/account_journal_view.xml b/addons/l10n_ch/account_journal_view.xml
index 3636cc971a1..aa5d6c20080 100755
--- a/addons/l10n_ch/account_journal_view.xml
+++ b/addons/l10n_ch/account_journal_view.xml
@@ -42,6 +42,7 @@
         <record id="action_config_journal_todo" model="ir.actions.todo">
           <field name="action_id" ref="action_config_journal"/>
           <field name="sequence">5</field>
+          <field name="restart">onskip</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index 6da45b45f0c..339e5cf887a 100755
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record model="ir.ui.view" id="view_res_bank_form">
-			<field name="name">res.bank.form</field>
-			<field name="model">res.bank</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_res_bank_form"/>
-			<field name="arch" type="xml">
-				<field name="bic" position="after">
-					<field name="clearing" select="2"/>
-				</field>
-			</field>
-		</record>
-		
-		<record model="ir.ui.view" id="l10nch_view_res_bank_tree">
-			<field name="name">res.bank.tree</field>
-			<field name="model">res.bank</field>
-			<field name="type">tree</field>
-			<field name="inherit_id" ref="base.view_res_bank_tree"/>
-			<field name="arch" type="xml">
-				<field name="code" position="after">
-					<field name="clearing" select="1"/>
-				</field>
-			</field>
-		</record>
+    <data>
+        <record model="ir.ui.view" id="view_res_bank_form">
+            <field name="name">res.bank.form</field>
+            <field name="model">res.bank</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_res_bank_form"/>
+            <field name="arch" type="xml">
+                <field name="bic" position="after">
+                    <field name="clearing"/>
+                </field>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="l10nch_view_res_bank_tree">
+            <field name="name">res.bank.tree</field>
+            <field name="model">res.bank</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="base.view_res_bank_tree"/>
+            <field name="arch" type="xml">
+                <field name="code" position="after">
+                    <field name="clearing" select="1"/>
+                </field>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="l10nch_view_res_partner_bank">
-			<field name="name">res.partner_bank.form</field>
-			<field name="model">res.partner.bank</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_partner_bank_form"/>
-			<field name="arch" type="xml">
-				<field name="country_id" position="after">
-					<field name="print_bank" select="2"/>
-                    <field name="print_account" select="2"/>
-				</field>
-			</field>
-		</record>
+            <field name="name">res.partner_bank.form</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_bank_form"/>
+            <field name="arch" type="xml">
+                <field name="country_id" position="after">
+                    <field name="print_bank"/>
+                    <field name="print_account"/>
+                </field>
+            </field>
+        </record>
          <record model="ir.ui.view" id="l10nch_view_res_partner_bank">
-			<field name="name">res.partner_partner_bank.form</field>
-			<field name="model">res.partner</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="account.view_partner_property_form"/>
-			<field name="arch" type="xml">
-				<field name="bank" position="after">
+            <field name="name">res.partner_partner_bank.form</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_partner_property_form"/>
+            <field name="arch" type="xml">
+                <field name="bank" position="after">
                     <newline />
-					<field name="print_bank" select="2"/>
-                    <field name="print_account" select="2"/>
-				</field>
-			</field>
-		</record>
-	</data>
+                    <field name="print_bank"/>
+                    <field name="print_account"/>
+                </field>
+            </field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/l10n_ch/dta_view.xml b/addons/l10n_ch/dta_view.xml
index 3b0f0e9d954..17e3479ca86 100755
--- a/addons/l10n_ch/dta_view.xml
+++ b/addons/l10n_ch/dta_view.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
-		<!-- Inherit both bank view -->
-		<record model="ir.ui.view" id="view_partner_bank_form">
-			<field name="name">partner - bank inherit</field>
-			<field name="model">res.partner</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_partner_form"/>
-			<field name="arch" type="xml">
-				<field name="acc_number" position="after">
-					<newline/>
-					<field name="bvr_number"/>
-					<field name="bvr_adherent_num"/>
-					<field name="post_number"/>
-					<field name="dta_code"/>
-				</field>
-			</field>
-		</record>
+        <!-- Inherit both bank view -->
+        <record model="ir.ui.view" id="view_partner_bank_form">
+            <field name="name">partner - bank inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <field name="acc_number" position="after">
+                    <newline/>
+                    <field name="bvr_number"/>
+                    <field name="bvr_adherent_num"/>
+                    <field name="post_number"/>
+                    <field name="dta_code"/>
+                </field>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_partner_bank_form2">
-			<field name="name">partner - bank inherit</field>
-			<field name="model">res.partner.bank</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_partner_bank_form"/>
-			<field name="arch" type="xml">
-				<field name="acc_number" position="after">
-					<newline/>
-					<field name="bvr_number"/>
-					<field name="bvr_adherent_num"/>
-					<field name="post_number"/>
-					<field name="dta_code"/>
-				</field>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_partner_bank_form2">
+            <field name="name">partner - bank inherit</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_bank_form"/>
+            <field name="arch" type="xml">
+                <field name="acc_number" position="after">
+                    <newline/>
+                    <field name="bvr_number"/>
+                    <field name="bvr_adherent_num"/>
+                    <field name="post_number"/>
+                    <field name="dta_code"/>
+                </field>
+            </field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/l10n_ch/i18n/ar.po b/addons/l10n_ch/i18n/ar.po
index 40bc1f6acb8..a42bd0ecd3a 100644
--- a/addons/l10n_ch/i18n/ar.po
+++ b/addons/l10n_ch/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/bg.po b/addons/l10n_ch/i18n/bg.po
index 9149182d55a..4561f1f83f5 100644
--- a/addons/l10n_ch/i18n/bg.po
+++ b/addons/l10n_ch/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/bs.po b/addons/l10n_ch/i18n/bs.po
index a668c7b500e..d41907dfb14 100644
--- a/addons/l10n_ch/i18n/bs.po
+++ b/addons/l10n_ch/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ca.po b/addons/l10n_ch/i18n/ca.po
index 60461816e52..9bf68816fdc 100644
--- a/addons/l10n_ch/i18n/ca.po
+++ b/addons/l10n_ch/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/cs.po b/addons/l10n_ch/i18n/cs.po
index b6310657562..4a080364a4c 100644
--- a/addons/l10n_ch/i18n/cs.po
+++ b/addons/l10n_ch/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/de.po b/addons/l10n_ch/i18n/de.po
index 53dacde1358..0dfe01d05b1 100644
--- a/addons/l10n_ch/i18n/de.po
+++ b/addons/l10n_ch/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/es.po b/addons/l10n_ch/i18n/es.po
index 56e0106c2d2..0ca834b5520 100644
--- a/addons/l10n_ch/i18n/es.po
+++ b/addons/l10n_ch/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/es_AR.po b/addons/l10n_ch/i18n/es_AR.po
index 1d8a22ae5a2..d22ef45af52 100644
--- a/addons/l10n_ch/i18n/es_AR.po
+++ b/addons/l10n_ch/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/et.po b/addons/l10n_ch/i18n/et.po
index 18cd60ebae1..af48f5ef69e 100644
--- a/addons/l10n_ch/i18n/et.po
+++ b/addons/l10n_ch/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/fr.po b/addons/l10n_ch/i18n/fr.po
index 3e9213002e6..44873ef8f33 100644
--- a/addons/l10n_ch/i18n/fr.po
+++ b/addons/l10n_ch/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/hr.po b/addons/l10n_ch/i18n/hr.po
index 40bc1f6acb8..a42bd0ecd3a 100644
--- a/addons/l10n_ch/i18n/hr.po
+++ b/addons/l10n_ch/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/hu.po b/addons/l10n_ch/i18n/hu.po
index 40bc1f6acb8..a42bd0ecd3a 100644
--- a/addons/l10n_ch/i18n/hu.po
+++ b/addons/l10n_ch/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/id.po b/addons/l10n_ch/i18n/id.po
index 64dfdf15091..f2dbf60ca4c 100644
--- a/addons/l10n_ch/i18n/id.po
+++ b/addons/l10n_ch/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index b002fc387d7..54754de19f3 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ko.po b/addons/l10n_ch/i18n/ko.po
index 96e50ea35de..27a8a955332 100644
--- a/addons/l10n_ch/i18n/ko.po
+++ b/addons/l10n_ch/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/lt.po b/addons/l10n_ch/i18n/lt.po
index 40bc1f6acb8..a42bd0ecd3a 100644
--- a/addons/l10n_ch/i18n/lt.po
+++ b/addons/l10n_ch/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/nl.po b/addons/l10n_ch/i18n/nl.po
index aaf2b27e36b..7ac07248f16 100644
--- a/addons/l10n_ch/i18n/nl.po
+++ b/addons/l10n_ch/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/nl_BE.po b/addons/l10n_ch/i18n/nl_BE.po
index 7a8a1351cb8..f6b23b60606 100644
--- a/addons/l10n_ch/i18n/nl_BE.po
+++ b/addons/l10n_ch/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/pl.po b/addons/l10n_ch/i18n/pl.po
index ea0d9cf34aa..8bbf1dfc322 100644
--- a/addons/l10n_ch/i18n/pl.po
+++ b/addons/l10n_ch/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/pt.po b/addons/l10n_ch/i18n/pt.po
index c7420b091da..d4fbdf081e4 100644
--- a/addons/l10n_ch/i18n/pt.po
+++ b/addons/l10n_ch/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/pt_BR.po b/addons/l10n_ch/i18n/pt_BR.po
index 7ec1c1f6ca3..a3ff36ceef6 100644
--- a/addons/l10n_ch/i18n/pt_BR.po
+++ b/addons/l10n_ch/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ro.po b/addons/l10n_ch/i18n/ro.po
index 40bc1f6acb8..a42bd0ecd3a 100644
--- a/addons/l10n_ch/i18n/ro.po
+++ b/addons/l10n_ch/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/ru.po b/addons/l10n_ch/i18n/ru.po
index 80077100839..42283a4a514 100644
--- a/addons/l10n_ch/i18n/ru.po
+++ b/addons/l10n_ch/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/sl.po b/addons/l10n_ch/i18n/sl.po
index 64a5b2cc341..8f46c3d8b67 100644
--- a/addons/l10n_ch/i18n/sl.po
+++ b/addons/l10n_ch/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/sv.po b/addons/l10n_ch/i18n/sv.po
index f63a4c49bb3..466a1de7918 100644
--- a/addons/l10n_ch/i18n/sv.po
+++ b/addons/l10n_ch/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+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 ac168e71c06..b75a53be39e 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/uk.po b/addons/l10n_ch/i18n/uk.po
index 0a085655386..a4aad395339 100644
--- a/addons/l10n_ch/i18n/uk.po
+++ b/addons/l10n_ch/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/zh_CN.po b/addons/l10n_ch/i18n/zh_CN.po
index be0638b1c61..69f9095cb4a 100644
--- a/addons/l10n_ch/i18n/zh_CN.po
+++ b/addons/l10n_ch/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/zh_TW.po b/addons/l10n_ch/i18n/zh_TW.po
index 40bc1f6acb8..a42bd0ecd3a 100644
--- a/addons/l10n_ch/i18n/zh_TW.po
+++ b/addons/l10n_ch/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 0cd99338041..3d707b3b39e 100755
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -154,7 +154,7 @@ class account_invoice(osv.osv):
     ## @param partner_bank_id the partner linked invoice bank
     ## @return the dict of values with the partner_bank value updated
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
+            date_invoice=False, payment_term=False, partner_bank=False, company_id=False):
         """ Function that is call when the partner of the invoice is changed
         it will retriev and set the good bank partner bank"""
         res = super(account_invoice, self).onchange_partner_id(
@@ -175,7 +175,7 @@ class account_invoice(osv.osv):
         if type in ('in_invoice', 'in_refund'):
             res['value']['partner_bank'] = bank_id
 
-        if partner_bank_id != bank_id:
+        if partner_bank != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
             res['value'].update(to_update['value'])
         return res
diff --git a/addons/l10n_ch_chart_c2c_pcg/__terp__.py b/addons/l10n_ch_chart_c2c_pcg/__openerp__.py
similarity index 100%
rename from addons/l10n_ch_chart_c2c_pcg/__terp__.py
rename to addons/l10n_ch_chart_c2c_pcg/__openerp__.py
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ar.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ar.po
index c8ddfa87bc3..8d258c2d969 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/ar.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/bg.po b/addons/l10n_ch_chart_c2c_pcg/i18n/bg.po
index 6935e6e74c4..d330c0dc2ef 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/bg.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/bs.po b/addons/l10n_ch_chart_c2c_pcg/i18n/bs.po
index 134ce07f978..9d5dd5147b2 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/bs.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ca.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ca.po
index 07395b51e5a..6893ce5ef14 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/ca.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/cs.po b/addons/l10n_ch_chart_c2c_pcg/i18n/cs.po
index c8ddfa87bc3..8d258c2d969 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/cs.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/de.po b/addons/l10n_ch_chart_c2c_pcg/i18n/de.po
index 0e45545e202..8e4fd7d1ee4 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/de.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/es.po b/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
index 1e3e3559bf4..5954316a0cd 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/es_AR.po b/addons/l10n_ch_chart_c2c_pcg/i18n/es_AR.po
index 0d73abf0aa5..21b6931e4cb 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/es_AR.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/et.po b/addons/l10n_ch_chart_c2c_pcg/i18n/et.po
index 92ddb6bfbc2..1abec44db47 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/et.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/fr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/fr.po
index f8dc1f3fcbd..f540d8c36f5 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/fr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/hr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/hr.po
index c8ddfa87bc3..8d258c2d969 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/hr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/hu.po b/addons/l10n_ch_chart_c2c_pcg/i18n/hu.po
index c8ddfa87bc3..8d258c2d969 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/hu.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/id.po b/addons/l10n_ch_chart_c2c_pcg/i18n/id.po
index 0cba7565b12..e3724bffdc4 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/id.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/it.po b/addons/l10n_ch_chart_c2c_pcg/i18n/it.po
index 80cd1879e5c..72dba9fb840 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/it.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ko.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ko.po
index 51102c6f638..98f1ca1a703 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/ko.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/lt.po b/addons/l10n_ch_chart_c2c_pcg/i18n/lt.po
index c8ddfa87bc3..8d258c2d969 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/lt.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/nl.po b/addons/l10n_ch_chart_c2c_pcg/i18n/nl.po
index 6b37d942a61..45b4279f330 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/nl.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/nl_BE.po b/addons/l10n_ch_chart_c2c_pcg/i18n/nl_BE.po
index 4621944b83c..8591040d306 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/nl_BE.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/pl.po b/addons/l10n_ch_chart_c2c_pcg/i18n/pl.po
index ca8abee4640..80a978b0c6c 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/pl.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/pt.po b/addons/l10n_ch_chart_c2c_pcg/i18n/pt.po
index 07ac48b048f..236f38c6c8c 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/pt.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/pt_BR.po b/addons/l10n_ch_chart_c2c_pcg/i18n/pt_BR.po
index 8e8d018f6d2..f0f190e24d9 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/pt_BR.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ro.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ro.po
index c8ddfa87bc3..8d258c2d969 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/ro.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po
index 515d00bc174..38f6c5867c1 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/sl.po b/addons/l10n_ch_chart_c2c_pcg/i18n/sl.po
index 45855c90f13..12c47ec95c3 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/sl.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/sv.po b/addons/l10n_ch_chart_c2c_pcg/i18n/sv.po
index 126479ff6f9..147ac06e5fb 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/sv.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
index e8fa2d0dc71..017474a9942 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/uk.po b/addons/l10n_ch_chart_c2c_pcg/i18n/uk.po
index f2dce10cbf1..f623d8d2094 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/uk.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/zh_CN.po b/addons/l10n_ch_chart_c2c_pcg/i18n/zh_CN.po
index c8ddfa87bc3..8d258c2d969 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/zh_CN.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/zh_TW.po b/addons/l10n_ch_chart_c2c_pcg/i18n/zh_TW.po
index c8ddfa87bc3..8d258c2d969 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/zh_TW.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml b/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
index 8cccce03fc5..526930b941e 100755
--- a/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
+++ b/addons/l10n_ch_chart_c2c_pcg/tax_template_view.xml
@@ -44,6 +44,7 @@
         <record id="action_config_tax_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_config_tax"/>
             <field name="sequence">5</field>
+            <field name="restart">onskip</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_ch_chart_c2c_pcg/wizard.xml b/addons/l10n_ch_chart_c2c_pcg/wizard.xml
index 0267a823f93..8b50c2eafed 100755
--- a/addons/l10n_ch_chart_c2c_pcg/wizard.xml
+++ b/addons/l10n_ch_chart_c2c_pcg/wizard.xml
@@ -7,6 +7,7 @@
                 This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
             <field name="action_id" ref="account.action_wizard_multi_chart"/>
             <field name="sequence">4</field>
+            <field name="restart">onskip</field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_chart_uk_minimal/__terp__.py b/addons/l10n_chart_uk_minimal/__openerp__.py
similarity index 100%
rename from addons/l10n_chart_uk_minimal/__terp__.py
rename to addons/l10n_chart_uk_minimal/__openerp__.py
diff --git a/addons/l10n_chart_uk_minimal/i18n/ar.po b/addons/l10n_chart_uk_minimal/i18n/ar.po
index b3f2c51fef4..82cac934e86 100644
--- a/addons/l10n_chart_uk_minimal/i18n/ar.po
+++ b/addons/l10n_chart_uk_minimal/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/bg.po b/addons/l10n_chart_uk_minimal/i18n/bg.po
index 85852a130e8..ca9ceb4c427 100644
--- a/addons/l10n_chart_uk_minimal/i18n/bg.po
+++ b/addons/l10n_chart_uk_minimal/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/bs.po b/addons/l10n_chart_uk_minimal/i18n/bs.po
index b3f2c51fef4..82cac934e86 100644
--- a/addons/l10n_chart_uk_minimal/i18n/bs.po
+++ b/addons/l10n_chart_uk_minimal/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/ca.po b/addons/l10n_chart_uk_minimal/i18n/ca.po
index e61b3e7679a..44709a8d447 100644
--- a/addons/l10n_chart_uk_minimal/i18n/ca.po
+++ b/addons/l10n_chart_uk_minimal/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/cs.po b/addons/l10n_chart_uk_minimal/i18n/cs.po
index b3f2c51fef4..82cac934e86 100644
--- a/addons/l10n_chart_uk_minimal/i18n/cs.po
+++ b/addons/l10n_chart_uk_minimal/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/de.po b/addons/l10n_chart_uk_minimal/i18n/de.po
index f72b5486187..8e84544670d 100644
--- a/addons/l10n_chart_uk_minimal/i18n/de.po
+++ b/addons/l10n_chart_uk_minimal/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/es.po b/addons/l10n_chart_uk_minimal/i18n/es.po
index 5937752a071..a3140121ec4 100644
--- a/addons/l10n_chart_uk_minimal/i18n/es.po
+++ b/addons/l10n_chart_uk_minimal/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/es_AR.po b/addons/l10n_chart_uk_minimal/i18n/es_AR.po
index 9b2a2557946..150010b404c 100644
--- a/addons/l10n_chart_uk_minimal/i18n/es_AR.po
+++ b/addons/l10n_chart_uk_minimal/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/et.po b/addons/l10n_chart_uk_minimal/i18n/et.po
index 56de983d287..6b897570519 100644
--- a/addons/l10n_chart_uk_minimal/i18n/et.po
+++ b/addons/l10n_chart_uk_minimal/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/fr.po b/addons/l10n_chart_uk_minimal/i18n/fr.po
index e6a19083186..bfb2915bbba 100644
--- a/addons/l10n_chart_uk_minimal/i18n/fr.po
+++ b/addons/l10n_chart_uk_minimal/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/hr.po b/addons/l10n_chart_uk_minimal/i18n/hr.po
index 7b88f310f88..dd3fbdcb341 100644
--- a/addons/l10n_chart_uk_minimal/i18n/hr.po
+++ b/addons/l10n_chart_uk_minimal/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/hu.po b/addons/l10n_chart_uk_minimal/i18n/hu.po
index b3f2c51fef4..82cac934e86 100644
--- a/addons/l10n_chart_uk_minimal/i18n/hu.po
+++ b/addons/l10n_chart_uk_minimal/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/id.po b/addons/l10n_chart_uk_minimal/i18n/id.po
index b26e27661f1..398cc7a63c7 100644
--- a/addons/l10n_chart_uk_minimal/i18n/id.po
+++ b/addons/l10n_chart_uk_minimal/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/it.po b/addons/l10n_chart_uk_minimal/i18n/it.po
index 3c86639b58e..bd931bc02d8 100644
--- a/addons/l10n_chart_uk_minimal/i18n/it.po
+++ b/addons/l10n_chart_uk_minimal/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/ko.po b/addons/l10n_chart_uk_minimal/i18n/ko.po
index 951c3c395bd..7d1c6a0149e 100644
--- a/addons/l10n_chart_uk_minimal/i18n/ko.po
+++ b/addons/l10n_chart_uk_minimal/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/lt.po b/addons/l10n_chart_uk_minimal/i18n/lt.po
index fa0f536544e..4a036ebe637 100644
--- a/addons/l10n_chart_uk_minimal/i18n/lt.po
+++ b/addons/l10n_chart_uk_minimal/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/nl.po b/addons/l10n_chart_uk_minimal/i18n/nl.po
index af520871634..004b7f278ec 100644
--- a/addons/l10n_chart_uk_minimal/i18n/nl.po
+++ b/addons/l10n_chart_uk_minimal/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/nl_BE.po b/addons/l10n_chart_uk_minimal/i18n/nl_BE.po
index dd2d298f5e9..2c8e6c49761 100644
--- a/addons/l10n_chart_uk_minimal/i18n/nl_BE.po
+++ b/addons/l10n_chart_uk_minimal/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/oc.po b/addons/l10n_chart_uk_minimal/i18n/oc.po
index 99e9b88251c..7697bdc53cf 100644
--- a/addons/l10n_chart_uk_minimal/i18n/oc.po
+++ b/addons/l10n_chart_uk_minimal/i18n/oc.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-03-12 14:00+0000\n"
+"PO-Revision-Date: 2010-04-17 09:33+0000\n"
 "Last-Translator: Cédric VALMARY (Per Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
@@ -42,12 +42,12 @@ msgstr "Produches"
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_tax
 msgid "Tax"
-msgstr "Impôts et taxes"
+msgstr "Impòstes e taxas"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_cash
 msgid "Cash"
-msgstr ""
+msgstr "Liquiditats"
 
 #. module: l10n_chart_uk_minimal
 #: model:ir.actions.todo,note:l10n_chart_uk_minimal.config_call_account_template_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/pl.po b/addons/l10n_chart_uk_minimal/i18n/pl.po
index b3f2c51fef4..82cac934e86 100644
--- a/addons/l10n_chart_uk_minimal/i18n/pl.po
+++ b/addons/l10n_chart_uk_minimal/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/pt.po b/addons/l10n_chart_uk_minimal/i18n/pt.po
index 070e90792c7..b0c98a91c17 100644
--- a/addons/l10n_chart_uk_minimal/i18n/pt.po
+++ b/addons/l10n_chart_uk_minimal/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/pt_BR.po b/addons/l10n_chart_uk_minimal/i18n/pt_BR.po
index fc62bec207f..4dba62658a5 100644
--- a/addons/l10n_chart_uk_minimal/i18n/pt_BR.po
+++ b/addons/l10n_chart_uk_minimal/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/ro.po b/addons/l10n_chart_uk_minimal/i18n/ro.po
index b3f2c51fef4..82cac934e86 100644
--- a/addons/l10n_chart_uk_minimal/i18n/ro.po
+++ b/addons/l10n_chart_uk_minimal/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/ru.po b/addons/l10n_chart_uk_minimal/i18n/ru.po
index 0a9c054a561..8a91a8123f8 100644
--- a/addons/l10n_chart_uk_minimal/i18n/ru.po
+++ b/addons/l10n_chart_uk_minimal/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/sl.po b/addons/l10n_chart_uk_minimal/i18n/sl.po
index dea57442c28..ecaa1b52819 100644
--- a/addons/l10n_chart_uk_minimal/i18n/sl.po
+++ b/addons/l10n_chart_uk_minimal/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/sv.po b/addons/l10n_chart_uk_minimal/i18n/sv.po
index de3a2dd68f5..b69c8a273e0 100644
--- a/addons/l10n_chart_uk_minimal/i18n/sv.po
+++ b/addons/l10n_chart_uk_minimal/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/tlh.po b/addons/l10n_chart_uk_minimal/i18n/tlh.po
index 9a0e845a060..64f635b935c 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tlh.po
+++ b/addons/l10n_chart_uk_minimal/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/tr.po b/addons/l10n_chart_uk_minimal/i18n/tr.po
index 72b07f150d3..a080c84ae82 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tr.po
+++ b/addons/l10n_chart_uk_minimal/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/uk.po b/addons/l10n_chart_uk_minimal/i18n/uk.po
index 42e0772a38c..b69fa470230 100644
--- a/addons/l10n_chart_uk_minimal/i18n/uk.po
+++ b/addons/l10n_chart_uk_minimal/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/zh_CN.po b/addons/l10n_chart_uk_minimal/i18n/zh_CN.po
index c285b849850..a31e62c6fcc 100644
--- a/addons/l10n_chart_uk_minimal/i18n/zh_CN.po
+++ b/addons/l10n_chart_uk_minimal/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/i18n/zh_TW.po b/addons/l10n_chart_uk_minimal/i18n/zh_TW.po
index a47e1194c97..e11b5197e01 100644
--- a/addons/l10n_chart_uk_minimal/i18n/zh_TW.po
+++ b/addons/l10n_chart_uk_minimal/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml b/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml
index b45012c87be..63a56521bd8 100644
--- a/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml
+++ b/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml
@@ -2,13 +2,14 @@
 <openerp>
     <data>
 
-		<record id="config_call_account_template_uk_minimal" model="ir.actions.todo">
-	        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-	        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-	        <field name="state">open</field>
-    	</record>
+        <record id="config_call_account_template_uk_minimal" model="ir.actions.todo">
+            <field name="name">Generate Chart of Accounts from a Chart Template</field>
+            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
+    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
+            <field name="action_id" ref="account.action_wizard_multi_chart"/>
+            <field name="state">open</field>
+            <field name="restart">onskip</field>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_fr/__terp__.py b/addons/l10n_fr/__openerp__.py
similarity index 100%
rename from addons/l10n_fr/__terp__.py
rename to addons/l10n_fr/__openerp__.py
diff --git a/addons/l10n_fr/i18n/ar.po b/addons/l10n_fr/i18n/ar.po
index deb32559f53..7fff1c3602e 100644
--- a/addons/l10n_fr/i18n/ar.po
+++ b/addons/l10n_fr/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/bg.po b/addons/l10n_fr/i18n/bg.po
index f94472f1ed5..b54247ecc2f 100644
--- a/addons/l10n_fr/i18n/bg.po
+++ b/addons/l10n_fr/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/bs.po b/addons/l10n_fr/i18n/bs.po
index deb32559f53..7fff1c3602e 100644
--- a/addons/l10n_fr/i18n/bs.po
+++ b/addons/l10n_fr/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/ca.po b/addons/l10n_fr/i18n/ca.po
index 9150c78c2b7..946f9a04bd2 100644
--- a/addons/l10n_fr/i18n/ca.po
+++ b/addons/l10n_fr/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/cs.po b/addons/l10n_fr/i18n/cs.po
index deb32559f53..7fff1c3602e 100644
--- a/addons/l10n_fr/i18n/cs.po
+++ b/addons/l10n_fr/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/de.po b/addons/l10n_fr/i18n/de.po
index ae0415c0da2..568b64f717c 100644
--- a/addons/l10n_fr/i18n/de.po
+++ b/addons/l10n_fr/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index 2d7f7c543a4..750284bf019 100644
--- a/addons/l10n_fr/i18n/es.po
+++ b/addons/l10n_fr/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/es_AR.po b/addons/l10n_fr/i18n/es_AR.po
index 101fc2e3a52..0963d32dba3 100644
--- a/addons/l10n_fr/i18n/es_AR.po
+++ b/addons/l10n_fr/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/et.po b/addons/l10n_fr/i18n/et.po
index a264bea6e41..ec5774272b4 100644
--- a/addons/l10n_fr/i18n/et.po
+++ b/addons/l10n_fr/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/fr.po b/addons/l10n_fr/i18n/fr.po
index aa18c32097d..f70b913fd88 100644
--- a/addons/l10n_fr/i18n/fr.po
+++ b/addons/l10n_fr/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/hr.po b/addons/l10n_fr/i18n/hr.po
index deb32559f53..7fff1c3602e 100644
--- a/addons/l10n_fr/i18n/hr.po
+++ b/addons/l10n_fr/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/hu.po b/addons/l10n_fr/i18n/hu.po
index deb32559f53..7fff1c3602e 100644
--- a/addons/l10n_fr/i18n/hu.po
+++ b/addons/l10n_fr/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/id.po b/addons/l10n_fr/i18n/id.po
index 75e2f51ed91..d984a65a987 100644
--- a/addons/l10n_fr/i18n/id.po
+++ b/addons/l10n_fr/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/it.po b/addons/l10n_fr/i18n/it.po
index e22d871670d..389ab1adb39 100644
--- a/addons/l10n_fr/i18n/it.po
+++ b/addons/l10n_fr/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/ko.po b/addons/l10n_fr/i18n/ko.po
index 2beb2aee4e2..ec8a373ce90 100644
--- a/addons/l10n_fr/i18n/ko.po
+++ b/addons/l10n_fr/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/lt.po b/addons/l10n_fr/i18n/lt.po
index bae3a939fc3..8686c69cf36 100644
--- a/addons/l10n_fr/i18n/lt.po
+++ b/addons/l10n_fr/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/nl.po b/addons/l10n_fr/i18n/nl.po
index a5aa0654565..4bd44b3eb49 100644
--- a/addons/l10n_fr/i18n/nl.po
+++ b/addons/l10n_fr/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/nl_BE.po b/addons/l10n_fr/i18n/nl_BE.po
index a39dcc46f69..c1eec2e3af4 100644
--- a/addons/l10n_fr/i18n/nl_BE.po
+++ b/addons/l10n_fr/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/oc.po b/addons/l10n_fr/i18n/oc.po
index bbba0beebf6..ac269730472 100644
--- a/addons/l10n_fr/i18n/oc.po
+++ b/addons/l10n_fr/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/pl.po b/addons/l10n_fr/i18n/pl.po
index 596bc7a49da..9ab5656cf1c 100644
--- a/addons/l10n_fr/i18n/pl.po
+++ b/addons/l10n_fr/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/pt.po b/addons/l10n_fr/i18n/pt.po
index 16d325a1255..9751e8f03f8 100644
--- a/addons/l10n_fr/i18n/pt.po
+++ b/addons/l10n_fr/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/pt_BR.po b/addons/l10n_fr/i18n/pt_BR.po
index c658246dc0d..c65a28aedb7 100644
--- a/addons/l10n_fr/i18n/pt_BR.po
+++ b/addons/l10n_fr/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/ro.po b/addons/l10n_fr/i18n/ro.po
index deb32559f53..7fff1c3602e 100644
--- a/addons/l10n_fr/i18n/ro.po
+++ b/addons/l10n_fr/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/ru.po b/addons/l10n_fr/i18n/ru.po
index 45cc58b7f0c..23c1ce5b6e3 100644
--- a/addons/l10n_fr/i18n/ru.po
+++ b/addons/l10n_fr/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/sl.po b/addons/l10n_fr/i18n/sl.po
index 75af0e0f4ba..eae60d4cfb5 100644
--- a/addons/l10n_fr/i18n/sl.po
+++ b/addons/l10n_fr/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/sv.po b/addons/l10n_fr/i18n/sv.po
index 64bfe6fb7b0..c03a05c30fa 100644
--- a/addons/l10n_fr/i18n/sv.po
+++ b/addons/l10n_fr/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/tlh.po b/addons/l10n_fr/i18n/tlh.po
index 5198d08a013..f79ade9c0e2 100644
--- a/addons/l10n_fr/i18n/tlh.po
+++ b/addons/l10n_fr/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index 07f2517ca57..8a42c0dfd21 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/uk.po b/addons/l10n_fr/i18n/uk.po
index 96c911a6848..b1c6742fe38 100644
--- a/addons/l10n_fr/i18n/uk.po
+++ b/addons/l10n_fr/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/zh_CN.po b/addons/l10n_fr/i18n/zh_CN.po
index 44e6dd69aa4..ee238205852 100644
--- a/addons/l10n_fr/i18n/zh_CN.po
+++ b/addons/l10n_fr/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/zh_TW.po b/addons/l10n_fr/i18n/zh_TW.po
index 6a6f5526f84..e4d94eb088c 100644
--- a/addons/l10n_fr/i18n/zh_TW.po
+++ b/addons/l10n_fr/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/l10n_fr_pcg_wizard.xml b/addons/l10n_fr/l10n_fr_pcg_wizard.xml
index ea260b8fc0f..3fe6f946717 100644
--- a/addons/l10n_fr/l10n_fr_pcg_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_pcg_wizard.xml
@@ -2,24 +2,25 @@
 <openerp>
   <data>
     <wizard  id="wizard_l10n_fr_pcg_cdr_report"
-	     string="Compte de resultat" 
-	     model="account.move.line"
-	     name="l10n.fr.cdr.report"
-	     keyword="client_print_multi"
-	     />
-	     
+         string="Compte de resultat" 
+         model="account.move.line"
+         name="l10n.fr.cdr.report"
+         keyword="client_print_multi"
+         />
+         
     <wizard  id="wizard_l10n_fr_pcg_bilan_report"
-	     string="Bilan" 
-	     model="account.move.line"
-	     name="l10n.fr.bilan.report"
-	     keyword="client_print_multi"
-	     />
-	     
-	<record id="config_call_account_template_fr_pcg" model="ir.actions.todo">
-	        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-	        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-  	</record>     
+         string="Bilan" 
+         model="account.move.line"
+         name="l10n.fr.bilan.report"
+         keyword="client_print_multi"
+         />
+         
+    <record id="config_call_account_template_fr_pcg" model="ir.actions.todo">
+            <field name="name">Generate Chart of Accounts from a Chart Template</field>
+            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
+This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
+            <field name="action_id" ref="account.action_wizard_multi_chart"/>
+            <field name="restart">onskip</field>
+      </record>
   </data>
 </openerp>
diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__openerp__.py
similarity index 100%
rename from addons/l10n_lu/__terp__.py
rename to addons/l10n_lu/__openerp__.py
diff --git a/addons/l10n_lu/i18n/ar.po b/addons/l10n_lu/i18n/ar.po
index e81204db222..292cd77cfab 100644
--- a/addons/l10n_lu/i18n/ar.po
+++ b/addons/l10n_lu/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/bg.po b/addons/l10n_lu/i18n/bg.po
index 3059892ff5a..d5cd92bb016 100644
--- a/addons/l10n_lu/i18n/bg.po
+++ b/addons/l10n_lu/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/bs.po b/addons/l10n_lu/i18n/bs.po
index 8e057e2aa92..79a6fd18b86 100644
--- a/addons/l10n_lu/i18n/bs.po
+++ b/addons/l10n_lu/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/ca.po b/addons/l10n_lu/i18n/ca.po
index ff388dd2066..bb7f6d2472a 100644
--- a/addons/l10n_lu/i18n/ca.po
+++ b/addons/l10n_lu/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/cs.po b/addons/l10n_lu/i18n/cs.po
index e81204db222..292cd77cfab 100644
--- a/addons/l10n_lu/i18n/cs.po
+++ b/addons/l10n_lu/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/de.po b/addons/l10n_lu/i18n/de.po
index a1287ce4ce2..3627a64daf5 100644
--- a/addons/l10n_lu/i18n/de.po
+++ b/addons/l10n_lu/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/es.po b/addons/l10n_lu/i18n/es.po
index e11455841a8..e19f629b84f 100644
--- a/addons/l10n_lu/i18n/es.po
+++ b/addons/l10n_lu/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/es_AR.po b/addons/l10n_lu/i18n/es_AR.po
index 9aeaaab4589..c98167f2f1f 100644
--- a/addons/l10n_lu/i18n/es_AR.po
+++ b/addons/l10n_lu/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/et.po b/addons/l10n_lu/i18n/et.po
index a9eb6d29c0a..eefd0522d84 100644
--- a/addons/l10n_lu/i18n/et.po
+++ b/addons/l10n_lu/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/fr.po b/addons/l10n_lu/i18n/fr.po
index 03a74c468db..21f7c92ed21 100644
--- a/addons/l10n_lu/i18n/fr.po
+++ b/addons/l10n_lu/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/hr.po b/addons/l10n_lu/i18n/hr.po
index 64830a17bd7..3f5b5a75047 100644
--- a/addons/l10n_lu/i18n/hr.po
+++ b/addons/l10n_lu/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/hu.po b/addons/l10n_lu/i18n/hu.po
index 8e057e2aa92..79a6fd18b86 100644
--- a/addons/l10n_lu/i18n/hu.po
+++ b/addons/l10n_lu/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/id.po b/addons/l10n_lu/i18n/id.po
index bde3ad97c69..af1937d899a 100644
--- a/addons/l10n_lu/i18n/id.po
+++ b/addons/l10n_lu/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/it.po b/addons/l10n_lu/i18n/it.po
index e04e82045bb..13724285497 100644
--- a/addons/l10n_lu/i18n/it.po
+++ b/addons/l10n_lu/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/ko.po b/addons/l10n_lu/i18n/ko.po
index 5049a935b00..44f17b2f6db 100644
--- a/addons/l10n_lu/i18n/ko.po
+++ b/addons/l10n_lu/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/lt.po b/addons/l10n_lu/i18n/lt.po
index fd08a52974b..b9b22d17a75 100644
--- a/addons/l10n_lu/i18n/lt.po
+++ b/addons/l10n_lu/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/nl.po b/addons/l10n_lu/i18n/nl.po
index 4a5c3a7e261..e842d9f6476 100644
--- a/addons/l10n_lu/i18n/nl.po
+++ b/addons/l10n_lu/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/nl_BE.po b/addons/l10n_lu/i18n/nl_BE.po
index de4695557ce..b7e411feee4 100644
--- a/addons/l10n_lu/i18n/nl_BE.po
+++ b/addons/l10n_lu/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/oc.po b/addons/l10n_lu/i18n/oc.po
index 41b0632ed06..1145676d4dc 100644
--- a/addons/l10n_lu/i18n/oc.po
+++ b/addons/l10n_lu/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/pl.po b/addons/l10n_lu/i18n/pl.po
index 2500afa0c1f..0dd5fc5a288 100644
--- a/addons/l10n_lu/i18n/pl.po
+++ b/addons/l10n_lu/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/pt.po b/addons/l10n_lu/i18n/pt.po
index 0f023be1868..b32b611cc0e 100644
--- a/addons/l10n_lu/i18n/pt.po
+++ b/addons/l10n_lu/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/pt_BR.po b/addons/l10n_lu/i18n/pt_BR.po
index 8877aed5f05..0a1a8b34c0d 100644
--- a/addons/l10n_lu/i18n/pt_BR.po
+++ b/addons/l10n_lu/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/ro.po b/addons/l10n_lu/i18n/ro.po
index 8e057e2aa92..79a6fd18b86 100644
--- a/addons/l10n_lu/i18n/ro.po
+++ b/addons/l10n_lu/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/ru.po b/addons/l10n_lu/i18n/ru.po
index fda2c2e0e82..f38cf375ea3 100644
--- a/addons/l10n_lu/i18n/ru.po
+++ b/addons/l10n_lu/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/sl.po b/addons/l10n_lu/i18n/sl.po
index 692cffa2a2c..175da45394b 100644
--- a/addons/l10n_lu/i18n/sl.po
+++ b/addons/l10n_lu/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/sv.po b/addons/l10n_lu/i18n/sv.po
index 3fd601bd919..98616097491 100644
--- a/addons/l10n_lu/i18n/sv.po
+++ b/addons/l10n_lu/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/tlh.po b/addons/l10n_lu/i18n/tlh.po
index 176ee4f3fd0..22abf71afda 100644
--- a/addons/l10n_lu/i18n/tlh.po
+++ b/addons/l10n_lu/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index a2184847908..71e2f9bba99 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/uk.po b/addons/l10n_lu/i18n/uk.po
index e418efceaf9..ccb7266226d 100644
--- a/addons/l10n_lu/i18n/uk.po
+++ b/addons/l10n_lu/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/zh_CN.po b/addons/l10n_lu/i18n/zh_CN.po
index 89ea8978d53..f70f40aabae 100644
--- a/addons/l10n_lu/i18n/zh_CN.po
+++ b/addons/l10n_lu/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/zh_TW.po b/addons/l10n_lu/i18n/zh_TW.po
index 029aa55b64c..dc9103ca888 100644
--- a/addons/l10n_lu/i18n/zh_TW.po
+++ b/addons/l10n_lu/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index cbbf76975c4..da34f6456ab 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -4,6 +4,7 @@
 
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
+        <field name="restart">onskip</field>
     </record>
 
     <menuitem
diff --git a/addons/lunch/__terp__.py b/addons/lunch/__openerp__.py
similarity index 100%
rename from addons/lunch/__terp__.py
rename to addons/lunch/__openerp__.py
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index eb24cdc53dc..962330c1ea2 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -3,20 +3,20 @@
     <data>
           <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
           <menuitem name="Lunch Order" parent="base.menu_tools"
-          	id="menu_lunch" sequence="1" />
+              id="menu_lunch" sequence="1" />
 
           <menuitem name="Reporting" parent="base.menu_tools"
-          	id="base.menu_lunch_reporting" sequence="5" />
+              id="base.menu_lunch_reporting" sequence="5" />
 
           <menuitem name="Lunch Orders"
-          	parent="base.menu_lunch_reporting"
-          	id="menu_lunch_reporting_order" sequence="1" />
+              parent="base.menu_lunch_reporting"
+              id="menu_lunch_reporting_order" sequence="1" />
 
           <menuitem name="Configuration" parent="base.menu_tools"
-          	id="base.menu_lunch_survey_root" sequence="6" />
+              id="base.menu_lunch_survey_root" sequence="6" />
 
           <menuitem name="Lunch" parent="base.menu_lunch_survey_root"
-          	id="menu_lunch_category_root_configuration" sequence="1" />
+              id="menu_lunch_category_root_configuration" sequence="1" />
 
 <!-- Lunch order Form view -->
 
@@ -32,7 +32,7 @@
                         <field name="price"/>
                         <field name="descript"/>
                         <field name="cashmove"/>
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                     </group>
                 </form>
             </field>
@@ -66,7 +66,7 @@
         </record>
 
         <menuitem name="Lunch Order" parent="menu_lunch"
-        	id="menu_lunch_order_form" action="action_lunch_order_form" />
+            id="menu_lunch_order_form" action="action_lunch_order_form" />
 
 <!--  Cash Box Form view  -->
 
@@ -104,9 +104,9 @@
         </record>
 
         <menuitem name="CashBox"
-        	parent="menu_lunch_category_root_configuration"
-        	id="menu_lunch_cashbox_form"
-        	action="action_lunch_cashbox_form" />
+            parent="menu_lunch_category_root_configuration"
+            id="menu_lunch_cashbox_form"
+            action="action_lunch_cashbox_form" />
 
 <!-- Cash Move Form view  -->
 
@@ -117,7 +117,7 @@
                 <form string="CashMove">
                     <field name="name" select="1"/>
                     <field name="user_cashmove" select="1"/>
-                    <field name="amount" select="2"/>
+                    <field name="amount"/>
                     <field name="box" select="1"/>
                     <field name="create_date" select="1"/>
                     <field name="active" select="1"/>
@@ -150,8 +150,8 @@
         </record>
 
         <menuitem name="Cash Moves" parent="menu_lunch"
-        	id="menu_lunch_cashmove_form"
-        	action="action_lunch_cashmove_form" />
+            id="menu_lunch_cashmove_form"
+            action="action_lunch_cashmove_form" />
 
 <!-- Lunch Category Form view  -->
 
@@ -227,18 +227,18 @@
         </record>
 
         <menuitem name="Tools/Lunch/Configuration/Products"
-        	id="menu_lunch_product_form" action="action_lunch_product_form"
-        	sequence="1" />
+            id="menu_lunch_product_form" action="action_lunch_product_form"
+            sequence="1" />
 
         <menuitem name="Products"
-        	parent="menu_lunch_category_root_configuration"
-        	id="menu_lunch_product_form" action="action_lunch_product_form"
-        	sequence="2" />
+            parent="menu_lunch_category_root_configuration"
+            id="menu_lunch_product_form" action="action_lunch_product_form"
+            sequence="2" />
 
         <menuitem name="Category of product"
-        	parent="menu_lunch_category_root_configuration"
-        	id="menu_lunch_category_form"
-        	action="action_lunch_category_form" sequence="1" />
+            parent="menu_lunch_category_root_configuration"
+            id="menu_lunch_category_form"
+            action="action_lunch_category_form" sequence="1" />
 
 
 <!-- Lunch Amount Tree view -->
@@ -281,9 +281,9 @@
         </record>
 
         <menuitem name="Cash Position by User"
-        	parent="menu_lunch_reporting_order"
-        	action="action_report_lunch_amount_tree"
-        	id="menu_lunch_report_amount_tree" />
+            parent="menu_lunch_reporting_order"
+            action="action_report_lunch_amount_tree"
+            id="menu_lunch_report_amount_tree" />
 
     </data>
 </openerp>
diff --git a/addons/mail_gateway/__init__.py b/addons/mail_gateway/__init__.py
index 0bf7eb43128..2aefd8b3c11 100644
--- a/addons/mail_gateway/__init__.py
+++ b/addons/mail_gateway/__init__.py
@@ -19,11 +19,5 @@
 #
 ##############################################################################
 
-import mail_gateway
-import wizard
-
-
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mail_gateway/__terp__.py b/addons/mail_gateway/__openerp__.py
similarity index 74%
rename from addons/mail_gateway/__terp__.py
rename to addons/mail_gateway/__openerp__.py
index ea816774651..13c69301dda 100644
--- a/addons/mail_gateway/__terp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -19,23 +19,23 @@
 #
 ##############################################################################
 
-
 {
-    'name': 'eMail Gateway',
+    'name': 'Email Gateway System',
     'version': '1.0',
-    'category': 'Generic Modules/eMail Gate',
-    'description': """
-The generic email gateway system for the synchronisation interface
-between mails and Open Objects.
-""",
+    'category': 'Generic Modules/Mail Service',
+    'description': """The generic email gateway system allows to send and receive emails
+    * IMAP / IMAP with SSL
+    * POP / POP with SSL
+    * SMTP / SMTP with TLS
+    * ACL basd access polocy 
+    * Queing and History for Emails
+    * Easy Integration with any Module""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'process'],
-    'init_xml': ['mail_gateway_data.xml',],
+    'depends': ['smtpclient', 'fetchmail'],
+    'init_xml': [],
     'update_xml': [
-        'mail_gateway_wizard.xml',        
-        'mail_gateway_view.xml',                
-        'security/ir.model.access.csv',        
+        
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
deleted file mode 100644
index 6a7df28b2d1..00000000000
--- a/addons/mail_gateway/mail_gateway.py
+++ /dev/null
@@ -1,409 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-###########################################################################################
-
-import re
-import email, mimetypes
-from email.Header import decode_header
-from email.MIMEText import MIMEText
-import xmlrpclib
-import os
-import binascii
-import time, socket
-
-from tools.translate import _
-
-import tools
-from osv import fields,osv,orm
-from osv.orm import except_orm
-import email
-import netsvc
-from poplib import POP3, POP3_SSL
-from imaplib import IMAP4, IMAP4_SSL   
-
-class mail_gateway_server(osv.osv):
-    _name = "mail.gateway.server"
-    _description = "Email Gateway Server"
-    _columns = {
-        'name': fields.char('Server Address',size=64,required=True ,help="IMAP/POP Address Of Email gateway Server"),
-        'login': fields.char('User',size=64,required=True,help="User Login Id of Email gateway"),
-        'password': fields.char('Password',size=64,required=True,help="User Password Of Email gateway"),
-        'server_type': fields.selection([("pop","POP"),("imap","Imap")],"Type of Server", required=True, help="Type of Email gateway Server"),
-        'port': fields.integer("Port" , help="Port Of Email gateway Server. If port is omitted, the standard POP3 port (110) is used for POP EMail Server and the standard IMAP4 port (143) is used for IMAP Sever."),
-        'ssl': fields.boolean('SSL',help ="Use Secure Authentication"),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the email gateway server without removing it."),
-    }
-    _defaults = {
-        'server_type':lambda * a:'pop',
-        'active':lambda * a:True,
-    }
-    
-    def check_duplicate(self, cr, uid, ids):
-        vals = self.read(cr, uid, ids, ['name', 'login'])[0]
-        cr.execute("select count(id) from mail_gateway_server \
-                        where name='%s' and login='%s'" % \
-                        (vals['name'], vals['login']))
-        res = cr.fetchone()
-        if res:
-            if res[0] > 1:
-                return False
-        return True 
-
-    _constraints = [
-        (check_duplicate, 'Warning! Can\'t have duplicate server configuration!', ['name', 'login'])
-    ]
-    
-    def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False):
-        port = 0
-        if server_type == 'pop':
-            port = ssl and 995 or 110
-        elif server_type == 'imap':
-            port = ssl and 993 or 143
-        return {'value':{'port':port}}
-    
-mail_gateway_server()
-
-
-class mail_gateway(osv.osv):
-    _name = "mail.gateway"
-    _description = "Email Gateway"
-
-    _columns = {
-        'name': fields.char('Name',size=64,help="Name of Mail Gateway."),
-        'server_id': fields.many2one('mail.gateway.server',"Gateway Server", required=True),
-        'object_id': fields.many2one('ir.model',"Model", required=True),
-        'reply_to': fields.char('TO', size=64, help="Email address used in reply to/from of outgoing messages"),
-        'email_default': fields.char('Default eMail',size=64,help="Default eMail in case of any trouble."),        
-        'mail_history': fields.one2many("mail.gateway.history","gateway_id","History", readonly=True)
-    }
-    _defaults = {
-        'reply_to': lambda * a:tools.config.get('email_from',False)
-    }
-
-    def _fetch_mails(self, cr, uid, ids=False, context={}):
-        '''
-        Function called by the scheduler to fetch mails
-        '''
-        cr.execute('select * from mail_gateway gateway \
-                inner join mail_gateway_server server \
-                on server.id = gateway.server_id where server.active = True')
-        ids2 = map(lambda x: x[0], cr.fetchall() or [])
-        return self.fetch_mails(cr, uid, ids=ids2, context=context)
-
-    def parse_mail(self, cr, uid, gateway_id, email_message, context={}):
-        msg_id, res_id, note = (False, False, False)        
-        mail_history_obj = self.pool.get('mail.gateway.history')        
-        mailgateway = self.browse(cr, uid, gateway_id, context=context)
-        try :
-            msg_txt = email.message_from_string(email_message)
-            msg_id =  msg_txt['Message-ID']
-            res_id = self.msg_parse(cr, uid, gateway_id, msg_txt)            
-        except Exception, e:
-            import traceback
-            note = "Error in Parsing Mail: %s " %(str(e))            
-            netsvc.Logger().notifyChannel('Emailgate: Parsing mail:%s' % (mailgateway and (mailgateway.name or
-                     '%s (%s)'%(mailgateway.server_id.login, mailgateway.server_id.name))) or ''
-                     , netsvc.LOG_ERROR, traceback.format_exc())
-
-        mail_history_obj.create(cr, uid, {'name': msg_id, 'res_id': res_id, 'gateway_id': mailgateway.id, 'note': note})
-        return res_id,  note
-
-    def fetch_mails(self, cr, uid, ids=[], context={}):        
-        log_messages = []
-        mailgate_server = False
-        new_messages = []
-        for mailgateway in self.browse(cr, uid, ids):
-            try :
-                mailgate_server = mailgateway.server_id
-                if not mailgate_server.active:
-                    continue
-                mailgate_name =  mailgateway.name or "%s (%s)" % (mailgate_server.login, mailgate_server.name)
-                res_model = mailgateway.object_id.name
-                log_messages.append("Mail Server : %s" % mailgate_name)
-                log_messages.append("="*40)
-                new_messages = []
-                if mailgate_server.server_type == 'pop':
-                    if mailgate_server.ssl:
-                        pop_server = POP3_SSL(mailgate_server.name or 'localhost', mailgate_server.port or 995)
-                    else:
-                        pop_server = POP3(mailgate_server.name or 'localhost', mailgate_server.port or 110)
-                    pop_server.user(mailgate_server.login)
-                    pop_server.pass_(mailgate_server.password)
-                    pop_server.list()
-                    (numMsgs, totalSize) = pop_server.stat()
-                    for i in range(1, numMsgs + 1):
-                        (header, msges, octets) = pop_server.retr(i)
-                        res_id, note = self.parse_mail(cr, uid, mailgateway.id, '\n'.join(msges))
-                        log = ''
-                        if res_id:
-                            log = _('Object Successfully Created : %d of %s'% (res_id, res_model))
-                        if note:
-                            log = note
-                        log_messages.append(log)
-                        new_messages.append(i)
-                    pop_server.quit()
-
-                elif mailgate_server.server_type == 'imap':
-                    if mailgate_server.ssl:
-                        imap_server = IMAP4_SSL(mailgate_server.name or 'localhost', mailgate_server.port or 993)
-                    else:
-                        imap_server = IMAP4(mailgate_server.name or 'localhost', mailgate_server.port or 143)
-                    imap_server.login(mailgate_server.login, mailgate_server.password)
-                    imap_server.select()
-                    typ, data = imap_server.search(None, '(UNSEEN)')
-                    for num in data[0].split():
-                        typ, data = imap_server.fetch(num, '(RFC822)')
-                        res_id, note = self.parse_mail(cr, uid, mailgateway.id, data[0][1])
-                        log = ''
-                        if res_id:
-                            log = _('Object Successfully Created/Modified: %d of %s'% (res_id, res_model))
-                        if note:
-                            log = note
-                        log_messages.append(log)
-                        new_messages.append(num)
-                    imap_server.close()
-                    imap_server.logout()
-
-            except Exception, e:
-                 import traceback
-                 log_messages.append("Error in Fetching Mail: %s " %(str(e)))                 
-                 netsvc.Logger().notifyChannel('Emailgate: Fetching mail:[%d]%s' % 
-                    (mailgate_server and mailgate_server.id or 0, mailgate_server and mailgate_server.name or ''),
-                     netsvc.LOG_ERROR, traceback.format_exc())
-
-            log_messages.append("-"*25)
-            log_messages.append("Total Read Mail: %d\n\n" %(len(new_messages)))
-        return log_messages    
-
-    def emails_get(self, email_from):
-        res = tools.email_re.search(email_from)
-        return res and res.group(1)
-
-    def partner_get(self, cr, uid, email):
-        mail = self.emails_get(email)
-        adr_ids = self.pool.get('res.partner.address').search(cr, uid, [('email', '=', mail)])
-        if not adr_ids:
-            return {}
-        adr = self.pool.get('res.partner.address').read(cr, uid, adr_ids, ['partner_id'])
-        res = {}
-        if len(adr):
-            res = {
-                'partner_address_id': adr[0]['id'],
-                'partner_id': adr[0].get('partner_id',False) and adr[0]['partner_id'][0] or False
-            }
-        return res
-
-    def _to_decode(self, s, charsets):
-       for charset in charsets:
-           if charset:
-               try:
-                   return s.decode(charset)
-               except UnicodeError:  
-                    pass         
-       try:
-           return s.decode('ascii')
-       except UnicodeError:
-           return s 
-
-    def _decode_header(self, s):        
-        from email.Header import decode_header
-        s = decode_header(s)
-        return ''.join(map(lambda x:self._to_decode(x[0], x[1]), s))
-
-    def msg_new(self, cr, uid, msg, model):
-        message = self.msg_body_get(msg)
-        res_model = self.pool.get(model)
-        res_id = res_model.msg_new(cr, uid, msg)
-        if res_id:
-            attachments = message['attachment']
-
-            for attach in attachments or []:
-                data_attach = {
-                    'name': str(attach),
-                    'datas':binascii.b2a_base64(str(attachments[attach])),
-                    'datas_fname': str(attach),
-                    'description': 'Mail attachment',
-                    'res_model': model,
-                    'res_id': res_id
-                }
-                self.pool.get('ir.attachment').create(cr, uid, data_attach)
-        return res_id
-
-
-    def msg_body_get(self, msg):        
-        message = {};
-        message['body'] = '';
-        message['attachment'] = {};
-        attachment = message['attachment'];
-        counter = 1;
-        def replace(match):
-            return ''        
-        for part in msg.walk():
-            if part.get_content_maintype() == 'multipart':
-                continue
-
-            if part.get_content_maintype()=='text':
-                buf = part.get_payload(decode=True)
-                if buf:
-                    txt = self._to_decode(buf, part.get_charsets())
-                    txt = re.sub("<(\w)>", replace, txt)
-                    txt = re.sub("<\/(\w)>", replace, txt)
-                if txt and part.get_content_subtype() == 'plain':
-                    message['body'] += txt 
-                elif txt and part.get_content_subtype() == 'html':                                                               
-                    message['body'] += tools.html2plaintext(txt)  
-                
-                filename = part.get_filename();
-                if filename :
-                    attachment[filename] = part.get_payload(decode=True);
-                    
-            elif part.get_content_maintype()=='application' or part.get_content_maintype()=='image' or part.get_content_maintype()=='text':
-                filename = part.get_filename();
-                if filename :
-                    attachment[filename] = part.get_payload(decode=True);
-                else:
-                    filename = 'attach_file'+str(counter);
-                    counter += 1;
-                    attachment[filename] = part.get_payload(decode=True);
-                #end if
-            #end if
-            message['attachment'] = attachment
-        #end for              
-        return message
-    #end def
-
-    def msg_update(self, cr, uid, msg, res_id, res_model, user_email):        
-        if user_email and self.emails_get(user_email)==self.emails_get(self._decode_header(msg['From'])):
-            return self.msg_user(cr, uid, msg, res_id, res_model)
-        else:
-            return self.msg_partner(cr, uid, msg, res_id, res_model)
-
-    def msg_act_get(self, msg):
-        body = self.msg_body_get(msg)
-
-        # handle email body commands (ex: Set-State: Draft)
-        actions = {}
-        body_data = ''
-        for line in body['body'].split('\n'):
-            res = tools.command_re.match(line)
-            if res:
-                actions[res.group(1).lower()] = res.group(2).lower()
-            else:
-                body_data += line+'\n'
-        return actions, body_data
-
-    def msg_user(self, cr, uid, msg, res_id, res_model):
-        actions, body_data = self.msg_act_get(msg)        
-        data = {}
-        if 'user' in actions:
-            uids = self.pool.get('res.users').name_search(cr, uid, actions['user'])
-            if uids:
-                data['user_id'] = uids[0][0]
-
-        res_model = self.pool.get(res_model)        
-        return res_model.msg_update(cr, uid, res_id, msg, data=data, default_act='pending')        
-
-    def msg_send(self, msg, reply_to, emails, priority=None, res_id=False):         
-        if not emails:
-            return False                
-        msg_to = [emails[0]]
-        msg_subject = msg['Subject']        
-        msg_cc = []
-        msg_body = self.msg_body_get(msg)        
-        if len(emails)>1:            
-            msg_cc = emails[1:]
-        msg_attachment = map(lambda x: (x[0], x[1]), msg_body['attachment'].items())                  
-        return tools.email_send(reply_to, msg_to, msg_subject , msg_body['body'], email_cc=msg_cc, 
-                         reply_to=reply_to, attach=msg_attachment, openobject_id=res_id, priority=priority)
-        
-
-    def msg_partner(self, cr, uid, msg, res_id, res_model):
-        res_model = self.pool.get(res_model)        
-        return res_model.msg_update(cr, uid, res_id, msg, data={}, default_act='open')      
-
-    
-
-    def msg_parse(self, cr, uid, mailgateway_id, msg):
-        mailgateway = self.browse(cr, uid, mailgateway_id)
-        res_model = mailgateway.object_id.model
-        res_str = tools.reference_re.search(msg.get('References', ''))
-        if res_str:
-            res_str = res_str.group(1)
-        else:
-            res_str = tools.res_re.search(msg.get('Subject', ''))
-            if res_str:
-                res_str = res_str.group(1)
-
-        def msg_test(res_str):
-            emails = ('', '', '', '')
-            if not res_str:
-                return (False, emails)  
-            res_str = int(res_str)          
-            if hasattr(self.pool.get(res_model), 'emails_get'):
-                emails = self.pool.get(res_model).emails_get(cr, uid, [res_str])[0]
-            return (res_str, emails)
-
-        (res_id, emails) = msg_test(res_str)
-        user_email, from_email, cc_email, priority = emails
-        if res_id:
-            self.msg_update(cr, uid, msg, res_id, res_model, user_email)
-            
-        else:
-            res_id = self.msg_new(cr, uid, msg, res_model)
-            (res_id, emails) = msg_test(res_id)
-            user_email, from_email, cc_email, priority = emails
-            subject = self._decode_header(msg['subject'])
-            if msg.get('Subject', ''):
-                del msg['Subject']
-            msg['Subject'] = '[%s] %s' %(str(res_id), subject)            
-
-        em = [user_email or '', from_email] + (cc_email or '').split(',')
-        emails = map(self.emails_get, filter(None, em))
-        mm = [self._decode_header(msg['From']), self._decode_header(msg['To'])]+self._decode_header(msg.get('Cc','')).split(',')
-        msg_mails = map(self.emails_get, filter(None, mm))
-        emails = filter(lambda m: m and m not in msg_mails, emails)
-        try:
-            self.msg_send(msg, mailgateway.reply_to, emails, priority, res_id)
-            if hasattr(self.pool.get(res_model), 'msg_send'):
-                emails = self.pool.get(res_model).msg_send(cr, uid, res_id)
-        except Exception, e:
-            if mailgateway.email_default:
-                a = self._decode_header(msg['Subject'])
-                del msg['Subject']
-                msg['Subject'] = '[OpenERP-Error] ' + a
-                self.msg_send(msg, mailgateway.reply_to, mailgateway.email_default.split(','), res_id)
-            raise e 
-        return res_id
-
-mail_gateway()
-
-class mail_gateway_history(osv.osv):
-    _name = "mail.gateway.history"
-    _description = "Mail Gateway History"
-    _columns = {
-        'name': fields.char('Message Id', size=64, help="Message Id in Email Server."),
-        'res_id': fields.integer("Resource ID"),        
-        'gateway_id': fields.many2one('mail.gateway',"Mail Gateway", required=True),
-        'model_id':fields.related('gateway_id', 'object_id', type='many2one', relation='ir.model', string='Model'), 
-        'note': fields.text('Notes'),
-        'create_date': fields.datetime('Created Date'),
-    }
-    _order = 'id desc'
-mail_gateway_history()
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
deleted file mode 100644
index b6112e1482f..00000000000
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    <record id="mail_gateway_history_form" model="ir.ui.view">
-            <field name="name">mail.gateway.history.form</field>
-            <field name="model">mail.gateway.history</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Gateway History">
-                    <field name="name"/>
-                    <field name="create_date"/>
-                    <field name="gateway_id"/>
-                    <field name="model_id"/>
-                    <field name="res_id"/>
-                    <separator string="Note" colspan="4"/>
-                    <field name="note" nolabel="1" colspan="4"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="mail_gateway_history_tree" model="ir.ui.view">
-            <field name="name">mail.gateway.history.tree</field>
-            <field name="model">mail.gateway.history</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Gateway History">
-                    <field name="name" select="1"/>
-                    <field name="create_date"/>
-                    <field name="model_id"/>
-                    <field name="res_id"/>
-                    <field name="gateway_id"/>
-                </tree>
-            </field>
-        </record>
-
-
-        <record id="mail_gateway_act" model="ir.actions.act_window">
-            <field name="name">Gateway History</field>
-            <field name="res_model">mail.gateway.history</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="mail_gateway_history_tree"/>
-        </record>
-
-        <act_window context="{'gateway_id': active_id}"
-        	domain="[('gateway_id', '=', active_id)]"
-        	id="act_gateway_history" name="Email History"
-        	res_model="mail.gateway.history" src_model="mail.gateway" />
-
-        <record id="mail_gateway_form" model="ir.ui.view">
-            <field name="name">mail.gateway.form</field>
-            <field name="model">mail.gateway</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Email Gateway">
-                    <field name="name"/>
-                    <field name="object_id"/>
-                    <field name="server_id" />
-                    <field name="reply_to"/>
-                    <field name="email_default" />
-                </form>
-            </field>
-        </record>
-
-        <record id="mail_gateway_tree" model="ir.ui.view">
-            <field name="name">mail.gateway.tree</field>
-            <field name="model">mail.gateway</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Email Gateway">
-                    <field name="name"/>
-                    <field name="object_id"/>
-                    <field name="server_id" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="mail_gateway_act" model="ir.actions.act_window">
-            <field name="name">Email Gateway</field>
-            <field name="res_model">mail.gateway</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="mail_gateway_tree"/>
-        </record>
-
-        <record id="mail_gateway_server_form" model="ir.ui.view">
-            <field name="name">mail.gateway.server.form</field>
-            <field name="model">mail.gateway.server</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Email Gateway Server">
-                    <field name="server_type" colspan="4" on_change="onchange_server_type(server_type,ssl)"/>
-                    <field name="name"/>
-                    <field name="port" />
-                    <field name="login" />
-                    <field name="password" password="True"/>
-                    <field name="ssl" on_change="onchange_server_type(server_type,ssl)"/>
-                    <field name="active" />
-                </form>
-            </field>
-        </record>
-
-        <record id="mail_gateway_server_tree" model="ir.ui.view">
-            <field name="name">mail.gateway.server.tree</field>
-            <field name="model">mail.gateway.server</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Email Gateway Server">
-                    <field name="name"/>
-                    <field name="port" />
-                    <field name="server_type"/>
-                    <field name="ssl" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="mail_gateway_server_act" model="ir.actions.act_window">
-            <field name="name">Email Gateway Server</field>
-            <field name="res_model">mail.gateway.server</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="mail_gateway_server_tree"/>
-        </record>        
-        
-        <menuitem id="email_gateway_menu_parent" name="Email Gateway" parent="base.menu_config" />
-        <menuitem id="email_gateway_menu" parent="email_gateway_menu_parent" action="mail_gateway_act"/>
-        <menuitem id="email_gateway_server_menu" parent="email_gateway_menu_parent" action="mail_gateway_server_act"/>
-    </data>
-</openerp>
diff --git a/addons/mail_gateway/mail_gateway_wizard.xml b/addons/mail_gateway/mail_gateway_wizard.xml
deleted file mode 100644
index 3c90868fac1..00000000000
--- a/addons/mail_gateway/mail_gateway_wizard.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <wizard string="Fetch Mail"
-           model="mail.gateway"
-           name="mail_gateway.fetchmail"
-           id="wizard_mailgateway_fetchmail"/>
-    </data>
-</openerp>
diff --git a/addons/mail_gateway/security/ir.model.access.csv b/addons/mail_gateway/security/ir.model.access.csv
deleted file mode 100644
index 864db00acb0..00000000000
--- a/addons/mail_gateway/security/ir.model.access.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mail_gateway_server","mail.gateway.server","model_mail_gateway_server","base.group_user",1,0,0,0
-"access_mail_gateway","mail.gateway","model_mail_gateway","base.group_user",1,0,0,0
-"access_mail_gateway_history","mail.gateway.history","model_mail_gateway_history","base.group_user",1,0,0,0
-
-
-
diff --git a/addons/mail_gateway/wizard/wizard_fetch_mail.py b/addons/mail_gateway/wizard/wizard_fetch_mail.py
deleted file mode 100644
index 10922835fe0..00000000000
--- a/addons/mail_gateway/wizard/wizard_fetch_mail.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-import wizard
-import time
-import pooler
-import tools
-import os
-_email_form = '''<?xml version="1.0"?>
-<form string="Email Gateway">
-    <separator string="Fetching Emails : " />
-    <field name="server" colspan="4" nolabel="1" />
- </form>'''
- 
-_email_done_form = '''<?xml version="1.0"?>
-<form string="Email Gateway"> 
-    <separator string="Log Detail" />
-    <newline/>   
-    <field name="message" colspan="4" nolabel="1"/>
- </form>''' 
-
-_email_fields = {
-    'server': {'string':"Server", 'type':'text', 'readonly':True},
-       }
-       
-_email_done_fields = {
-    'message': {'string':"Log Detail", 'type':'text', 'readonly':True},
-       }       
-
-def _default(self , cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    gateway_pool=pool.get('mail.gateway')   
-    server = []     
-    for mail_gateway in gateway_pool.browse(cr, uid, data['ids'], context=context):        
-        if mail_gateway.server_id.active:
-            server.append(mail_gateway.name or '%s (%s)'%(mail_gateway.server_id.login, mail_gateway.server_id.name) )
-    data['form']['server'] = '\n'.join(server)    
-    return data['form']
-    
-def section_fetch_mail(self , cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)     
-    gateway_pool=pool.get('mail.gateway')    
-    messages = gateway_pool.fetch_mails(cr, uid, ids=data['ids'], context=context)    
-    data['form']['message'] = '\n'.join(messages)    
-    return data['form']
-
-class wiz_mailgateway_fetch_mail(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_default],
-            'result': {'type': 'form', 'arch':_email_form, 'fields':_email_fields, 'state':[('end','Cancel','gtk-cancel'), ('fetch','Fetch','gtk-execute')]}
-                },        
-        'fetch': {
-            'actions': [section_fetch_mail],
-            'result': {'type': 'form', 'arch': _email_done_form,
-                'fields': _email_done_fields,
-                'state': (
-                    ('end', 'Close'),
-                )
-            },
-        },
-    }
-wiz_mailgateway_fetch_mail('mail_gateway.fetchmail')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/__terp__.py b/addons/membership/__openerp__.py
similarity index 100%
rename from addons/membership/__terp__.py
rename to addons/membership/__openerp__.py
diff --git a/addons/membership/i18n/ar.po b/addons/membership/i18n/ar.po
index e81e2fac6ae..0ab4dd431fa 100644
--- a/addons/membership/i18n/ar.po
+++ b/addons/membership/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/bg.po b/addons/membership/i18n/bg.po
index f125b67cb86..49be796f1d7 100644
--- a/addons/membership/i18n/bg.po
+++ b/addons/membership/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/bs.po b/addons/membership/i18n/bs.po
index 7c3b2eb2733..e6ca0339b6e 100644
--- a/addons/membership/i18n/bs.po
+++ b/addons/membership/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ca.po b/addons/membership/i18n/ca.po
index 1e8cda2bf8b..270c7c15c8c 100644
--- a/addons/membership/i18n/ca.po
+++ b/addons/membership/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/cs.po b/addons/membership/i18n/cs.po
index 8115eeea676..50e2aa93f91 100644
--- a/addons/membership/i18n/cs.po
+++ b/addons/membership/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index 3ec3534f998..77259c70498 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
index da52998aba8..ee0d69a3d15 100644
--- a/addons/membership/i18n/es.po
+++ b/addons/membership/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/es_AR.po b/addons/membership/i18n/es_AR.po
index ed7a6920423..ce7d96472e4 100644
--- a/addons/membership/i18n/es_AR.po
+++ b/addons/membership/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/et.po b/addons/membership/i18n/et.po
index 14d262a8115..bfcec029418 100644
--- a/addons/membership/i18n/et.po
+++ b/addons/membership/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/fi.po b/addons/membership/i18n/fi.po
index 02b36dfa2f5..4865955bdb7 100644
--- a/addons/membership/i18n/fi.po
+++ b/addons/membership/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index 36612292795..eb0e209bc9a 100644
--- a/addons/membership/i18n/fr.po
+++ b/addons/membership/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/hr.po b/addons/membership/i18n/hr.po
index e81e2fac6ae..0ab4dd431fa 100644
--- a/addons/membership/i18n/hr.po
+++ b/addons/membership/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/hu.po b/addons/membership/i18n/hu.po
index 1af1461f2c5..bf85069a6e1 100644
--- a/addons/membership/i18n/hu.po
+++ b/addons/membership/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/id.po b/addons/membership/i18n/id.po
index 878d5385e04..da4441e6a5d 100644
--- a/addons/membership/i18n/id.po
+++ b/addons/membership/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/it.po b/addons/membership/i18n/it.po
index d11c9563849..9ecabd89b91 100644
--- a/addons/membership/i18n/it.po
+++ b/addons/membership/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ko.po b/addons/membership/i18n/ko.po
index 548bf4b2197..22bd7027c57 100644
--- a/addons/membership/i18n/ko.po
+++ b/addons/membership/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/lt.po b/addons/membership/i18n/lt.po
index 6352f23e8e9..76c2404d05b 100644
--- a/addons/membership/i18n/lt.po
+++ b/addons/membership/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/nl.po b/addons/membership/i18n/nl.po
index dfafc9b6863..5224be4fee4 100644
--- a/addons/membership/i18n/nl.po
+++ b/addons/membership/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/nl_BE.po b/addons/membership/i18n/nl_BE.po
index c9a1abebe85..2c00887e6d4 100644
--- a/addons/membership/i18n/nl_BE.po
+++ b/addons/membership/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/pl.po b/addons/membership/i18n/pl.po
index 3eacbd37a27..82e341bfa5c 100644
--- a/addons/membership/i18n/pl.po
+++ b/addons/membership/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/pt.po b/addons/membership/i18n/pt.po
index 2f66bfa6912..10fcacee4af 100644
--- a/addons/membership/i18n/pt.po
+++ b/addons/membership/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/pt_BR.po b/addons/membership/i18n/pt_BR.po
index c2cc3640345..244813039a7 100644
--- a/addons/membership/i18n/pt_BR.po
+++ b/addons/membership/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ro.po b/addons/membership/i18n/ro.po
index 547ce6270fe..43b164bae2b 100644
--- a/addons/membership/i18n/ro.po
+++ b/addons/membership/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/ru.po b/addons/membership/i18n/ru.po
index 28359c3dc57..384eb797307 100644
--- a/addons/membership/i18n/ru.po
+++ b/addons/membership/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sk.po b/addons/membership/i18n/sk.po
index 4ca5bee87a9..a3a385fd739 100644
--- a/addons/membership/i18n/sk.po
+++ b/addons/membership/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sl.po b/addons/membership/i18n/sl.po
index d72ec0f2a25..7c1c82ea882 100644
--- a/addons/membership/i18n/sl.po
+++ b/addons/membership/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po
index eaa1f21374f..8db434508d1 100644
--- a/addons/membership/i18n/sv.po
+++ b/addons/membership/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/tlh.po b/addons/membership/i18n/tlh.po
index e76339fd130..3320094a8ac 100644
--- a/addons/membership/i18n/tlh.po
+++ b/addons/membership/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index a66d06ebbb4..54f205ed397 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/uk.po b/addons/membership/i18n/uk.po
index d7b45c51fe9..78b311d2813 100644
--- a/addons/membership/i18n/uk.po
+++ b/addons/membership/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index 0fcc36e492e..3937d1ead5a 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/zh_TW.po b/addons/membership/i18n/zh_TW.po
index 93c998909ec..24c877a9769 100644
--- a/addons/membership/i18n/zh_TW.po
+++ b/addons/membership/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index dd23cb61145..b459ab1eb9d 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -111,22 +111,22 @@
             </field>
         </record>
         <record id="view_res_partner_member_filter" model="ir.ui.view">
-		    <field name="name">res.partner.select</field>
-		    <field name="model">res.partner</field>
-		    <field name="type">search</field>
-		    <field name="arch" type="xml">
-		        <field name="category_id" position="after">
-		        	<field name="membership_state" select="1">
-			        	<filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" help="Paid Members"/>
-			        	<filter icon="terp-partner" domain="[('membership_state', '=', 'free')]" help="Free Members"/>
-			        	<filter icon="terp-partner" domain="[('associate_member', '!=', False), ('membership_state', '!=', 'none')]" help="Associated Members"/>
-			        	<filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" help="Invoiced Members"/>
-			        	<filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" help="Future Members"/>
-			        	<filter icon="terp-partner" domain="[('membership_state', '=', 'old')]" help="Old Members"/>
-					</field>
-		       </field>
-		    </field>
-	    </record>
+            <field name="name">res.partner.select</field>
+            <field name="model">res.partner</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <field name="category_id" position="after">
+                    <field name="membership_state" select="1">
+                        <filter icon="terp-partner" domain="[('membership_state', '=', 'paid')]" help="Paid Members"/>
+                        <filter icon="terp-partner" domain="[('membership_state', '=', 'free')]" help="Free Members"/>
+                        <filter icon="terp-partner" domain="[('associate_member', '!=', False), ('membership_state', '!=', 'none')]" help="Associated Members"/>
+                        <filter icon="terp-partner" domain="[('membership_state', '=', 'invoiced')]" help="Invoiced Members"/>
+                        <filter icon="terp-partner" domain="[('membership_state', '=', 'waiting')]" help="Future Members"/>
+                        <filter icon="terp-partner" domain="[('membership_state', '=', 'old')]" help="Old Members"/>
+                    </field>
+               </field>
+            </field>
+        </record>
 
         <record model="ir.actions.act_window" id="action_membership_members">
             <field name="name">Members</field>
@@ -180,13 +180,13 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Membership">
-                        <field name="membership_state" select="2"/>
-                        <field name="membership_amount" select="2"/>
+                        <field name="membership_state"/>
+                        <field name="membership_amount"/>
                         <field name="associate_member"/>
-                        <field name="free_member" select="2"/>
-                        <field name="membership_start" select="2"/>
-                        <field name="membership_stop" select="2"/>
-                        <field name="membership_cancel" select="2"/>
+                        <field name="free_member"/>
+                        <field name="membership_start"/>
+                        <field name="membership_stop"/>
+                        <field name="membership_cancel"/>
                         <field name="member_lines" nolabel="1" colspan="4">
                             <tree string="Membership">
                                 <field name="date_from"/>
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__openerp__.py
similarity index 100%
rename from addons/mrp/__terp__.py
rename to addons/mrp/__openerp__.py
diff --git a/addons/mrp/company.py b/addons/mrp/company.py
index 064b1034ba0..1844fff47eb 100644
--- a/addons/mrp/company.py
+++ b/addons/mrp/company.py
@@ -26,7 +26,7 @@ class company(osv.osv):
     _columns = {
         'schedule_range': fields.float('Scheduler Range', required=True,
             help="This is the time frame analysed by the scheduler when "\
-            "computing Requisitions. All Requisition that are not between "\
+            "computing procurements. All procurements that are not between "\
             "today and today+range are skipped for futur computation."),
         'po_lead': fields.float('Purchase Lead Time', required=True,
             help="This is the leads/security time for each purchase order."),
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index 406de140a0c..cc9014da297 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index c0bfc16aa98..e6b4e40ff7e 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index 737e69e0ea3..412aad53c7f 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index 6b1a1f9d8f4..fae49bfebb9 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index 43405b23ceb..31dd05f853f 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index fdf3a1bc3dc..0f54ce877d8 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index 979733ed22b..a3db8209bf2 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index 6d221871751..3a601c8bdbb 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index 3358e029308..5794b191ca4 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index 7e4b5597093..b844bd23f6b 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index 5121d802519..f43fb857b50 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index e55720e2c9e..34e0d2ef7aa 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 526b0fc1069..e5826d09524 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 254e59ddde7..5c2e4ecfc8a 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index 7ec4388218d..cb1c3c07aa4 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 1969a623e19..e185ff7b169 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index c30d6115bdc..d3068b07a8b 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index ccf4358bc28..386d7e6c51f 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index 7106ff5670f..508f3241032 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index f56ad983e2c..8f29ba236c6 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 83711002cff..59e69651b19 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index d7b1d15ae6f..35e3e1cdd62 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index d0b46d7ee40..95ab9f386db 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index a5bd09b8da7..7351640fedc 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index cf3fc9234cf..7577452a51d 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-30 10:42+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"PO-Revision-Date: 2010-04-13 05:41+0000\n"
+"Last-Translator: grisha <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -69,7 +69,7 @@ msgstr "Используемые мощности маршрута"
 #. module: mrp
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Не используется в расчётах, только для справки"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -157,6 +157,8 @@ msgid ""
 "Number of operation this workcenter can do in parallel. If this workcenter "
 "represent a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
+"Количество одновременно выполняемых рабочим центром операций. Если рабочиё "
+"центр представлен пятью рабочими, этот показатель равен 5"
 
 #. module: mrp
 #: wizard_button:product.product.procurement,init,create:0
@@ -204,7 +206,7 @@ msgstr ""
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Destination Location"
-msgstr ""
+msgstr "Место назначения"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -214,7 +216,7 @@ msgstr "Бухг. аналитика"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Do nothing"
-msgstr ""
+msgstr "Ничего не делать"
 
 #. module: mrp
 #: rml:mrp.production.order:0
@@ -341,7 +343,7 @@ msgstr "Запланированная к производству продук
 #. module: mrp
 #: field:mrp.workcenter,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Рабочее время"
 
 #. module: mrp
 #: view:mrp.procurement:0
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index fd3ebdc335a..f7ae917e3ae 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index bca323256e8..12881e14d55 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 94e3942736e..ce361f3fa4d 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index dedabeeb88b..edcae46acf9 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+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 ebfb1d41338..7f127a90780 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index 041e4b2067d..d74180713a1 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 6f3db8936d1..d4ce1b9c90c 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index 5303015f8f4..e651cb71509 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+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 227c9846172..72f81afcdf7 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 0524dd14312..429a3497634 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -334,12 +334,13 @@ class mrp_bom(osv.osv):
                     d, m = divmod(factor, wc_use.workcenter_id.capacity_per_cycle)
                     mult = (d + (m and 1.0 or 0.0))
                     cycle = mult * wc_use.cycle_nbr
+                    print mult, wc_use.hour_nbr, wc.time_start, wc.time_stop, cycle
                     result2.append({
                         'name': bom.routing_id.name,
                         'workcenter_id': wc.id,
                         'sequence': level+(wc_use.sequence or 0),
                         'cycle': cycle,
-                        'hour': float(wc_use.hour_nbr*mult + (wc.time_start+wc.time_stop+cycle*wc.time_cycle) * (wc.time_efficiency or 1.0)),
+                        'hour': float(wc_use.hour_nbr*mult + ((wc.time_start or 0.0)+(wc.time_stop or 0.0)+cycle*(wc.time_cycle or 0.0)) * (wc.time_efficiency or 1.0)),
                     })
             for bom2 in bom.bom_lines:
                 res = self._bom_explode(cr, uid, bom2, factor, properties, addthis=True, level=level+10)
@@ -995,16 +996,16 @@ mrp_production_product_line()
 #
 class mrp_procurement(osv.osv):
     """
-    Procument Orders / Requisitions
+    Procument Orders
     """
     _name = "mrp.procurement"
     _description = "Procurement"
     _order = 'priority,date_planned'
     
     _columns = {
-        'name': fields.char('Reason', size=64, required=True, help='Requisition name.'),
+        'name': fields.char('Reason', size=64, required=True, help='Procurement name.'),
         'origin': fields.char('Source Document', size=64,
-            help="Reference of the document that created this Requisition.\n"
+            help="Reference of the document that created this Procurement.\n"
             "This is automatically completed by Open ERP."),
         'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
         'date_planned': fields.datetime('Scheduled date', required=True),
@@ -1060,7 +1061,7 @@ class mrp_procurement(osv.osv):
             if s['state'] in ['draft','cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Requisition Order(s) which are in %s State!' % s['state']))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
     def onchange_product_id(self, cr, uid, ids, product_id, context={}):
@@ -1254,7 +1255,7 @@ class mrp_procurement(osv.osv):
         move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_qty <= 0.00:
-                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Requisition Order(s), it should not be less than 1!'))
+                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
             if procurement.product_id.type in ('product', 'consu'):
                 if not procurement.move_id:
                     source = procurement.location_id.id
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 571d74f1395..6e7a1afb6dc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -39,7 +39,7 @@
             id="menu_mrp_configuration"
             name="Configuration"
             parent="base.menu_mrp_root"
-            groups="group_mrp_manager"
+            groups="base.group_extended"
             sequence="50" />
 
         <record id="mrp_property_tree_view" model="ir.ui.view">
@@ -115,7 +115,7 @@
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="active" select="2"/>
+                        <field name="active"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
@@ -134,7 +134,7 @@
                                 <field name="time_stop"/>
                             </group>
                         </page>
-                        <page string="Analytic Accounting">
+                        <page string="Analytic Accounting" groups="base.group_extended">
                             <field name="costs_hour"/>
                             <field name="costs_hour_account_id"/>
                             <field name="costs_cycle"/>
@@ -197,7 +197,7 @@
                 <form string="Routing">
                     <separator colspan="4" string="General Information"/>
                     <field name="name" select="1"/>
-                    <field name="active" select="1"/>
+                    <field name="active" select="1" groups="base.group_extended"/>
                     <field name="code" select="1"/>
                     <field name="location_id"/>
                     <separator colspan="4" string="Description"/>
@@ -244,11 +244,11 @@
                     <group colspan="4" col="6">
                         <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
                         <field name="name" select="1"/>
-                        <field name="code" select="1"/>
+                        <field name="code" select="1" groups="base.group_extended"/>
                         <newline/>
                         <field name="product_uom"/>
                         <field name="product_qty"/>
-                        <field name="routing_id" select="2" groups="base.group_extended"/>
+                        <field name="routing_id" groups="base.group_extended"/>
                         <newline/>
                         <field name="product_uos" groups="product.group_uos"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
@@ -264,14 +264,14 @@
                         <page string="Revisions" groups="base.group_extended">
                             <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/>
                         </page>
-                        <page string="Properties">
-                            <field name="position" select="2"/>
-                            <field name="active" select="2"/>
+                        <page string="Properties" groups="base.group_extended">
+                            <field name="position"/>
+                            <field name="active"/>
                             <field name="sequence"/>
                             <field name="bom_id"/>
 
-                            <field name="date_start" select="2"/>
-                            <field name="date_stop" select="2"/>
+                            <field name="date_start"/>
+                            <field name="date_stop"/>
                             <field name="product_rounding"/>
                             <field name="product_efficiency"/>
                             <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
@@ -323,14 +323,17 @@
                   id="menu_mrp_bom"
                   parent="menu_mrp_bom"
                   sequence="50" />-->
-        <menuitem action="mrp_bom_form_action"
-                  id="menu_mrp_bom_form_action"
-                  parent="menu_mrp_bom"
-                  sequence="10"/>
-        <menuitem action="mrp_bom_form_action2"
-                  id="menu_mrp_bom_form_action2"
-                  parent="menu_mrp_bom"
-                  sequence="20"/>
+        <menuitem
+            action="mrp_bom_form_action"
+            id="menu_mrp_bom_form_action"
+            parent="menu_mrp_bom"
+            sequence="10"/>
+        <menuitem
+            action="mrp_bom_form_action2"
+            id="menu_mrp_bom_form_action2"
+            groups="base.group_extended"
+            parent="menu_mrp_bom"
+            sequence="20"/>
 
         <record id="action2" model="ir.actions.act_window">
             <field name="name">Bill of Materials Structure</field>
@@ -471,9 +474,9 @@
 
                     <notebook colspan="4">
                         <page string="Consumed Products">
-                            <field name="bom_id" select="2" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
+                            <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
                             <field name="routing_id" groups="base.group_extended" select="1"/>
-                            <field name="location_src_id" select="2" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                             <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                             <separator string="" colspan="4"/>
 
@@ -484,7 +487,6 @@
                                     <field name="product_qty"  string="Qty"/>
                                     <field name="product_uom"  string="UOM"/>
                                     <field name="location_id"  string="Source Loc."/>
-
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.move_consume)d"
                                         string="Consume Products" type="action"
@@ -493,7 +495,7 @@
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                        states="draft,waiting,confirmed,assigned"/>
                                 </tree>
                             </field>
 
@@ -516,13 +518,12 @@
                                            name="%(stock.move_scrap)d"
                                            string="Scrap Products" type="action"
                                            icon="gtk-convert"
-                                           states="done,cancel" />
-
+                                           states="done,cancel"/>
                                    </tree>
                                </field>
 
                             <group col="9" colspan="4">
-                                <field name="state" select="2"/>
+                                <field name="state"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
                                 <button name="button_produce" states="ready" string="Mark as Started" icon="gtk-execute"/>
@@ -570,7 +571,7 @@
                                    </tree>
                                </field>
                         </page>
-                        <page string="Work Orders">
+                        <page string="Work Orders" groups="base.group_extended">
                             <field colspan="4" name="workcenter_lines" nolabel="1">
                                 <form string="Production Work Centers">
                                     <field colspan="4" name="name" select="1"/>
@@ -587,7 +588,6 @@
                                     <field name="hour"/>
                                 </tree>
                             </field>
-
                         </page>
                         <page string="Scheduled Products">
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
@@ -596,12 +596,12 @@
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <field name="priority" groups="base.group_extended"/>
                             <newline/>
-                            <field name="date_start" select="2"/>
+                            <field name="date_start"/>
                             <field name="date_finnished"/>
-                            <field name="picking_id"/>
-                            <field name="move_prod_id"/>
-                            <field name="sale_name"/>
-                            <field name="sale_ref"/>
+                            <field name="picking_id" groups="base.group_extended"/>
+                            <field name="move_prod_id" groups="base.group_extended"/>
+                            <field name="sale_name" groups="base.group_extended"/>
+                            <field name="sale_ref" groups="base.group_extended"/>
                         </page>
                     </notebook>
                 </form>
@@ -618,7 +618,7 @@
                        <filter icon="terp-mrp" string="Draft"
                            domain="[('state','=','draft')]"
                            help="Non confirmed manufacturing orders"/>
-                       <filter icon="terp-mrp" string="Current"
+                       <filter icon="terp-mrp" string="Current" name="current"
                            domain="[('state','in',('confirmed','ready'))]"
                            help="Manufacturing Orders which are waiting for raw materials"/>
                        <filter icon="terp-mrp" string="Ready"
@@ -634,14 +634,14 @@
                        <separator orientation="vertical"/>
                        <field name="name"/>
                        <field name="product_id"/>
-                       <field name="routing_id"/>
+                       <field name="routing_id" groups="base.group_extended"/>
                        <field name="origin"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By" colspan="10" col="8">
                         <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}"/>
+                        <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
@@ -656,7 +656,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_Current":1}</field>
+            <field name="context">{"search_default_current":1}</field>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
@@ -714,8 +714,8 @@
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
-                    <field name="product_uos_qty"/>
-                    <field name="product_uos"/>
+                    <field name="product_uos_qty" groups="product.group_uos"/>
+                    <field name="product_uos" groups="product.group_uos"/>
                     <field name="tracking_id"/>
                 </form>
             </field>
@@ -729,8 +729,8 @@
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
-                    <field name="product_uos_qty"/>
-                    <field name="product_uos"/>
+                    <field name="product_uos_qty" groups="product.group_uos"/>
+                    <field name="product_uos" groups="product.group_uos"/>
                     <field name="tracking_id"/>
                 </tree>
             </field>
@@ -746,8 +746,8 @@
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
-                    <field name="product_uos_qty"/>
-                    <field name="product_uos"/>
+                    <field name="product_uos_qty" groups="product.group_uos"/>
+                    <field name="product_uos" groups="product.group_uos"/>
                 </form>
             </field>
         </record>
@@ -760,8 +760,8 @@
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
-                    <field name="product_uos_qty"/>
-                    <field name="product_uos"/>
+                    <field name="product_uos_qty" groups="product.group_uos"/>
+                    <field name="product_uos" groups="product.group_uos"/>
                 </tree>
             </field>
         </record>
@@ -795,20 +795,20 @@
                     <group col="2" colspan="2">
                         <separator colspan="2" string="References"/>
                         <field name="name" select="1" string="Procurement Reason"/>
-                        <field name="origin" select="2"/>
+                        <field name="origin"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Planification"/>
                         <field name="date_planned" select="1"/>
-                        <field name="procure_method" select="2"/>
+                        <field name="procure_method"/>
                         <field name="priority" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
                     <page string="Procurement Details">
                         <separator colspan="4" string="Product &amp; Location"/>
                         <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
-                        <field name="location_id" select="2" domain="[('usage','=','internal')]"/>
+                        <field name="location_id" domain="[('usage','=','internal')]"/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
 
@@ -817,7 +817,7 @@
 
                         <separator colspan="4" string="Status"/>
                         <field colspan="4" name="message" readonly="1"/>
-                        <field name="state" readonly="1" select="2"/>
+                        <field name="state" readonly="1"/>
                         <group col="7" colspan="2">
                             <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
                             <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
@@ -827,9 +827,9 @@
                     </page>
                     <page string="Extra Information">
                         <separator colspan="4" string="Details"/>
-                        <field name="bom_id" select="2" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
+                        <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
                         <field name="move_id" groups="base.group_extended"/>
-                        <field name="date_close" select="2"/>
+                        <field name="date_close"/>
                         <field name="close_move" groups="base.group_extended"/>
                         <field name="purchase_id"/>
                         <group colspan="4"  groups="base.group_extended">
@@ -852,7 +852,7 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group col='10' colspan='4'>
-                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" help="Procurement Orders in draft or open state."/>
+                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
                        <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
                        <filter icon="terp-mrp" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
@@ -879,14 +879,14 @@
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_Current":1}</field>
+            <field name="context">{"search_default_current":1}</field>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
         <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing"
                   sequence="2" />
 
         <record id="mrp_procurement_action3" model="ir.actions.act_window">
-            <field name="name">Requisitions</field>
+            <field name="name">Procurements</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
@@ -896,9 +896,6 @@
             <field name="context">{}</field>
         </record>
 
-      <menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
-                  sequence="5" />
-
         <record id="mrp_procurement_action5" model="ir.actions.act_window">
             <field name="name">Procurement Exceptions</field>
             <field name="type">ir.actions.act_window</field>
@@ -978,7 +975,7 @@
                     <group col="2" colspan="2">
                         <separator string="General Information" colspan="2" />
                         <field name="name" />
-                        <field name="product_id" on_change="onchange_product_id(product_id)" />
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
                         <field name="product_uom"/>
                     </group>
                     <group col="2" colspan="2">
@@ -993,7 +990,7 @@
                         <field name="product_max_qty"/>
                         <field name="qty_multiple"/>
                     </group>
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" groups="base.group_extended">
                         <separator string="Misc" colspan="2" />
                         <field name="procurement_id" readonly="1"/>
                         <field name="active" />
@@ -1001,6 +998,7 @@
                 </form>
             </field>
         </record>
+
         <record id="action_orderpoint_form" model="ir.actions.act_window">
             <field name="name">Minimum Stock Rules</field>
             <field name="res_model">stock.warehouse.orderpoint</field>
@@ -1040,7 +1038,10 @@
 
         <!-- Menu for Resource for MRP-->
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/>
-        <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root" sequence="2"/>
+
+        <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root"
+            groups="base.group_extended"
+            sequence="2"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 9162051086c..17d72a520f2 100755
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -1,102 +1,102 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<!--
-			Process
-		-->
+        <!--
+            Process
+        -->
 
-		<record id="process_process_procurementprocess0" model="process.process">
-			<field eval="&quot;&quot;&quot;Requisition&quot;&quot;&quot;" name="name"/>
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
-			<field eval="1" name="active"/>
-		</record>
+        <record id="process_process_procurementprocess0" model="process.process">
+            <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
+            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field eval="1" name="active"/>
+        </record>
 
-		<!--
-			Process Node
-		-->
+        <!--
+            Process Node
+        -->
 
-		<record id="process_node_stockproduct1" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="mrp.process_process_stockableproductprocess0"/>
-			<field name="subflow_id" ref="process_process_procurementprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-			<field eval="1" name="flow_start"/>
-		</record>
+        <record id="process_node_stockproduct1" model="process.node">
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp.process_process_stockableproductprocess0"/>
+            <field name="subflow_id" ref="process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
 
-		<record id="process_node_serviceproduct1" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="mrp.process_process_serviceproductprocess0"/>
-			<field name="subflow_id" ref="process_process_procurementprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-			<field eval="1" name="flow_start"/>
-		</record>
+        <record id="process_node_serviceproduct1" model="process.node">
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="mrp.process_process_serviceproductprocess0"/>
+            <field name="subflow_id" ref="process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
 
-		<record id="process_node_productionorder0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
-			<field name="model_id" ref="mrp.model_mrp_production"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Drives the requisition orders for raw material.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_procurementprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')&quot;&quot;&quot;" name="model_states"/>
-			<field eval="1" name="flow_start"/>
-		</record>
+        <record id="process_node_productionorder0" model="process.node">
+            <field name="menu_id" ref="mrp.menu_mrp_production_action"/>
+            <field name="model_id" ref="mrp.model_mrp_production"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Drives the procurement orders for raw material.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
 
-		<record id="process_node_minimumstockrule0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
-			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_procurementprocess0"/>
-			<field eval="1" name="flow_start"/>
-		</record>
+        <record id="process_node_minimumstockrule0" model="process.node">
+            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
+            <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field eval="1" name="flow_start"/>
+        </record>
 
-		<record id="process_node_procureproducts0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;The way to requisition depends on the product type.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
-			<field name="process_id" ref="process_process_procurementprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
+        <record id="process_node_procureproducts0" model="process.node">
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
+            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
 
-		<record id="process_node_stockproduct0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
-			<field name="subflow_id" ref="process_process_stockableproductprocess0"/>
-			<field name="process_id" ref="process_process_procurementprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
+        <record id="process_node_stockproduct0" model="process.node">
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
+            <field name="subflow_id" ref="process_process_stockableproductprocess0"/>
+            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
 
-		<record id="process_node_serviceproduct0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
-			<field name="model_id" ref="mrp.model_mrp_procurement"/>
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
-			<field name="subflow_id" ref="process_process_serviceproductprocess0"/>
-			<field name="process_id" ref="process_process_procurementprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
+        <record id="process_node_serviceproduct0" model="process.node">
+            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="model_id" ref="mrp.model_mrp_procurement"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
+            <field name="subflow_id" ref="process_process_serviceproductprocess0"/>
+            <field name="process_id" ref="process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
 
-		<record id="process_node_purchaseprocure0" model="process.node">
+        <record id="process_node_purchaseprocure0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
@@ -137,83 +137,83 @@
             <field eval="0" name="flow_start"/>
         </record>
 
-		<!--
-			Process Transition
-		-->
+        <!--
+            Process Transition
+        -->
 
-		<record id="process_transition_servicemto0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="mrp.process_node_serviceonorder0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
-		</record>
+        <record id="process_transition_servicemto0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="mrp.process_node_serviceonorder0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
+        </record>
 
-		<record id="process_transition_servicemts0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;This is used in case of a service without any impact in the system, a training session for instance.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
-		</record>
+        <record id="process_transition_servicemts0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;This is used in case of a service without any impact in the system, a training session for instance.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
+        </record>
 
-		<record id="process_transition_stockmts0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
-		</record>
+        <record id="process_transition_stockmts0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
+        </record>
 
-		<record id="process_transition_stockproduct0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;The system creates an order (production or purchased) depending on the sold quantity and the products parameters.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
-		</record>
+        <record id="process_transition_stockproduct0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The system creates an order (production or purchased) depending on the sold quantity and the products parameters.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
+        </record>
 
-		<record id="process_transition_productionprocureproducts0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Requisition of raw material&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;In order to supply raw material (to be purchased or produced), the production order creates as much requisition orders as components listed in the BOM, through a run of the schedulers (MRP).&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
-		</record>
+        <record id="process_transition_productionprocureproducts0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Procurement of raw material&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP).&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
+        </record>
 
-		<record id="process_transition_minimumstockprocure0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;'Minimum stock rule' material&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached.&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/>
-		</record>
+        <record id="process_transition_minimumstockprocure0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;'Minimum stock rule' material&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/>
+        </record>
 
-		<record id="process_transition_procurestockableproduct0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Procurement of stockable Products&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... &quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
-		</record>
+        <record id="process_transition_procurestockableproduct0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Procurement of stockable Products&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... &quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
+        </record>
 
-		<record id="process_transition_procureserviceproduct0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Requisition of services&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Depending on the chosen method to 'supply' the service, the requisition order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products).&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
-		</record>
+        <record id="process_transition_procureserviceproduct0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Procurement of services&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products).&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
+        </record>
 
-		<record id="process_transition_purchaseprocure0" model="process.transition">
+        <record id="process_transition_purchaseprocure0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Automatic RFQ&quot;&quot;&quot;" name="name"/>
@@ -240,7 +240,7 @@
             <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/>
         </record>
 
-		<record id="process_transition_bom0" model="process.transition">
+        <record id="process_transition_bom0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Manufacturing decomposition&quot;&quot;&quot;" name="name"/>
@@ -249,5 +249,5 @@
             <field model="process.node" name="source_node_id" ref="product.process_node_product0"/>
         </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index c358748ba31..8a306d8e79d 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -59,8 +59,8 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
+                   		<filter string="This Year" name="this_year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
+						<filter string="This Month" name="this_month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
                         <separator orientation="vertical"/>
 						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
 						<filter string="Scheduled Date" icon="terp-hr" domain="[('scheduled_date',=,time.strftime('%%m/%%d/%%Y'))]"/>
@@ -90,7 +90,7 @@
             <field name="res_model">mrp.production.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_This Year":1,"search_default_This Month":1}</field>
+            <field name="context">{"search_default_this_year":1,"search_default_this_month":1}</field>
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
         </record>
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 5de7c7be34b..cf66f93f0e4 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -50,8 +50,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem id="next_id_77" name="Reporting" parent="base.menu_mrp_root" sequence="49"/>
-        <menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
+        <menuitem id="next_id_77" name="Reporting"
+            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"/>
 
         <!-- stock.move compared to internal location src/dest -->
 
diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py
index 12341ceb5a0..cc482d95c52 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp/schedulers.py
@@ -115,7 +115,7 @@ class mrp_procurement(osv.osv):
     '''% (start_date, end_date, report_total, report_except, report_later)
             summary += '\n'.join(report)
             request.create(cr, uid,
-                {'name': "Requisition calculation report.",
+                {'name': "Procurement calculation report.",
                     'act_from': uid,
                     'act_to': uid,
                     'body': summary,
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 05f7c3c18c8..21cfac88242 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -45,13 +45,13 @@ class stock_warehouse_orderpoint(osv.osv):
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
         'product_min_qty': fields.float('Min Quantity', required=True,
             help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a requisition to bring the virtual stock to the Max Quantity."),
+            "a procurement to bring the virtual stock to the Max Quantity."),
         'product_max_qty': fields.float('Max Quantity', required=True,
             help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a requisition to bring the virtual stock to the Max Quantity."),
+            "a procurement to bring the virtual stock to the Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The requisition quantity will by rounded up to this multiple."),
-        'procurement_id': fields.many2one('mrp.procurement', 'Latest Requisition'),
+            help="The procurement quantity will by rounded up to this multiple."),
+        'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {
@@ -100,7 +100,7 @@ class StockMove(osv.osv):
     
     _columns = {
         'production_id': fields.many2one('mrp.production', 'Production', select=True),
-        'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'),
+        'procurements': fields.one2many('mrp.procurement', 'move_id', 'Procurements'),
     }
     
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/mrp/wizard/make_procurement_view.xml b/addons/mrp/wizard/make_procurement_view.xml
index 08c4b2cabf5..c60f2818ab2 100644
--- a/addons/mrp/wizard/make_procurement_view.xml
+++ b/addons/mrp/wizard/make_procurement_view.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!--  Make Procurement -->
-        
-		<record id="view_make_procurment_wizard" model="ir.ui.view">
-            <field name="name">Requisition Request</field>
+
+        <record id="view_make_procurment_wizard" model="ir.ui.view">
+            <field name="name">Procurement Request</field>
             <field name="model">make.procurement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Requisition Request">
-				    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/>
-				    <field name="product_id" on_change="onchange_product_id(product_id)"/>
-				    <field name="qty"/>
-				    <field name="uom_id"/>
-				    <field name="date_planned"/>
-				    <field name="warehouse_id" colspan="4"/>
-				    <newline/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
-                		<button name="make_procurement" string="Ask New Products"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                <form string="Procurement Request">
+                    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/>
+                    <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                    <field name="qty"/>
+                    <field name="uom_id"/>
+                    <field name="date_planned"/>
+                    <field name="warehouse_id" colspan="4"/>
+                    <newline/>
+                    <group col="2" colspan="4">
+                        <button icon='gtk-cancel' special="cancel"
+                            string="Cancel" />
+                        <button name="make_procurement" string="Ask New Products"
+                            colspan="1" type="object" icon="gtk-ok" />
+                    </group>
                 </form>
             </field>
         </record>
 
-        <act_window name="Requisition Request"		    
-		    res_model="make.procurement"
-		    src_model="product.product"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="act_make_procurement"/>       
-		
-	</data>
-</openerp>	
+        <act_window name="Procurement Request"
+            res_model="make.procurement"
+            src_model="product.product"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="act_make_procurement"/>
+
+    </data>
+</openerp>
diff --git a/addons/mrp/wizard/mrp_procurement_view.xml b/addons/mrp/wizard/mrp_procurement_view.xml
index 6d78f89793d..817f7011e0c 100644
--- a/addons/mrp/wizard/mrp_procurement_view.xml
+++ b/addons/mrp/wizard/mrp_procurement_view.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!--  Compute Procurement -->
-        
-		<record id="view_compute_procurment_wizard" model="ir.ui.view">
+
+        <record id="view_compute_procurment_wizard" model="ir.ui.view">
             <field name="name">Compute Procurements</field>
             <field name="model">mrp.procurement.compute</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters">
-				    <label string="This wizard will schedule procurements." colspan="4" align="0.0"/>
-				    <newline/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Cancel" />
-                		<button name="procure_calculation" string="Compute Requisitions"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
+                    <label string="This wizard will schedule procurements." colspan="4" align="0.0"/>
+                    <newline/>
+                    <group col="2" colspan="4">
+                        <button icon='gtk-cancel' special="cancel"
+                            string="Cancel" />
+                        <button name="procure_calculation" string="Compute Procurements"
+                            colspan="1" type="object" icon="gtk-ok" />
+                    </group>
                 </form>
             </field>
         </record>
 
-<!--        <act_window name="Compute Procurements"		    -->
-<!--		    res_model="mrp.procurement.compute"-->
-<!--		    src_model="mrp.procurement"-->
-<!--		    view_mode="form"-->
-<!--		    target="new"        -->
+<!--        <act_window name="Compute Procurements"            -->
+<!--            res_model="mrp.procurement.compute"-->
+<!--            src_model="mrp.procurement"-->
+<!--            view_mode="form"-->
+<!--            target="new"        -->
 <!--            key2="client_action_multi"    -->
-<!--		    id="act_compute_procurement"/>       -->
-		
-	</data>
-</openerp>	
+<!--            id="act_compute_procurement"/>       -->
+        
+    </data>
+</openerp>    
diff --git a/addons/mrp_jit/__terp__.py b/addons/mrp_jit/__openerp__.py
similarity index 100%
rename from addons/mrp_jit/__terp__.py
rename to addons/mrp_jit/__openerp__.py
diff --git a/addons/mrp_jit/i18n/ar.po b/addons/mrp_jit/i18n/ar.po
index 24dfe975828..e360455a7d0 100644
--- a/addons/mrp_jit/i18n/ar.po
+++ b/addons/mrp_jit/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/bg.po b/addons/mrp_jit/i18n/bg.po
index 33114a92b52..ff1e32b2fc6 100644
--- a/addons/mrp_jit/i18n/bg.po
+++ b/addons/mrp_jit/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/bs.po b/addons/mrp_jit/i18n/bs.po
index 24dfe975828..e360455a7d0 100644
--- a/addons/mrp_jit/i18n/bs.po
+++ b/addons/mrp_jit/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ca.po b/addons/mrp_jit/i18n/ca.po
index 5500a0d683f..afbc4fdd41f 100644
--- a/addons/mrp_jit/i18n/ca.po
+++ b/addons/mrp_jit/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/cs.po b/addons/mrp_jit/i18n/cs.po
index 9029c7dfe19..76da08a9ce1 100644
--- a/addons/mrp_jit/i18n/cs.po
+++ b/addons/mrp_jit/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/da.po b/addons/mrp_jit/i18n/da.po
index 8c0b1ccd8cb..e918d53682e 100644
--- a/addons/mrp_jit/i18n/da.po
+++ b/addons/mrp_jit/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/de.po b/addons/mrp_jit/i18n/de.po
index 7ab8c409371..196d0c4abed 100644
--- a/addons/mrp_jit/i18n/de.po
+++ b/addons/mrp_jit/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/el.po b/addons/mrp_jit/i18n/el.po
index 45592e4d5dd..44eddbf3e79 100644
--- a/addons/mrp_jit/i18n/el.po
+++ b/addons/mrp_jit/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/mrp_jit/i18n/es.po b/addons/mrp_jit/i18n/es.po
index c988d8b3366..dd8e7aa17a9 100644
--- a/addons/mrp_jit/i18n/es.po
+++ b/addons/mrp_jit/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/es_AR.po b/addons/mrp_jit/i18n/es_AR.po
index df51412ca82..f820393ad3b 100644
--- a/addons/mrp_jit/i18n/es_AR.po
+++ b/addons/mrp_jit/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/et.po b/addons/mrp_jit/i18n/et.po
index 945b0469978..8b7aef0b9ac 100644
--- a/addons/mrp_jit/i18n/et.po
+++ b/addons/mrp_jit/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/fi.po b/addons/mrp_jit/i18n/fi.po
index 5019ed123bc..d66cdee39d0 100644
--- a/addons/mrp_jit/i18n/fi.po
+++ b/addons/mrp_jit/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/fr.po b/addons/mrp_jit/i18n/fr.po
index 062398c9d0e..d399c9b24fc 100644
--- a/addons/mrp_jit/i18n/fr.po
+++ b/addons/mrp_jit/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/gl.po b/addons/mrp_jit/i18n/gl.po
index c8c32724454..5b86b40e071 100644
--- a/addons/mrp_jit/i18n/gl.po
+++ b/addons/mrp_jit/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/hr.po b/addons/mrp_jit/i18n/hr.po
index f1e26a3f87b..4536e38ac0c 100644
--- a/addons/mrp_jit/i18n/hr.po
+++ b/addons/mrp_jit/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/hu.po b/addons/mrp_jit/i18n/hu.po
index 24dfe975828..e360455a7d0 100644
--- a/addons/mrp_jit/i18n/hu.po
+++ b/addons/mrp_jit/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/id.po b/addons/mrp_jit/i18n/id.po
index d2239b08341..b0db4f46b38 100644
--- a/addons/mrp_jit/i18n/id.po
+++ b/addons/mrp_jit/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/it.po b/addons/mrp_jit/i18n/it.po
index 909627f7d60..d918db9e097 100644
--- a/addons/mrp_jit/i18n/it.po
+++ b/addons/mrp_jit/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ko.po b/addons/mrp_jit/i18n/ko.po
index e509c0c0baf..32989380f2d 100644
--- a/addons/mrp_jit/i18n/ko.po
+++ b/addons/mrp_jit/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/lt.po b/addons/mrp_jit/i18n/lt.po
index ba21ef4f756..3e209f2ba9e 100644
--- a/addons/mrp_jit/i18n/lt.po
+++ b/addons/mrp_jit/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ml.po b/addons/mrp_jit/i18n/ml.po
index c4d888734de..9676d9a896a 100644
--- a/addons/mrp_jit/i18n/ml.po
+++ b/addons/mrp_jit/i18n/ml.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/nl.po b/addons/mrp_jit/i18n/nl.po
index 0907d5645f7..466dffdce47 100644
--- a/addons/mrp_jit/i18n/nl.po
+++ b/addons/mrp_jit/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/nl_BE.po b/addons/mrp_jit/i18n/nl_BE.po
index 1b0f41bec8e..c1c0e1b2ba2 100644
--- a/addons/mrp_jit/i18n/nl_BE.po
+++ b/addons/mrp_jit/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/oc.po b/addons/mrp_jit/i18n/oc.po
index 478e0afc343..9313c778726 100644
--- a/addons/mrp_jit/i18n/oc.po
+++ b/addons/mrp_jit/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/pl.po b/addons/mrp_jit/i18n/pl.po
index b73eec797d9..8f3ae48e0b1 100644
--- a/addons/mrp_jit/i18n/pl.po
+++ b/addons/mrp_jit/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/pt.po b/addons/mrp_jit/i18n/pt.po
index a1e22496612..7412daaf896 100644
--- a/addons/mrp_jit/i18n/pt.po
+++ b/addons/mrp_jit/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/pt_BR.po b/addons/mrp_jit/i18n/pt_BR.po
index cc75367d3bc..3b63d26c435 100644
--- a/addons/mrp_jit/i18n/pt_BR.po
+++ b/addons/mrp_jit/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ro.po b/addons/mrp_jit/i18n/ro.po
index 24dfe975828..e360455a7d0 100644
--- a/addons/mrp_jit/i18n/ro.po
+++ b/addons/mrp_jit/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/ru.po b/addons/mrp_jit/i18n/ru.po
index 24dfe975828..e360455a7d0 100644
--- a/addons/mrp_jit/i18n/ru.po
+++ b/addons/mrp_jit/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sk.po b/addons/mrp_jit/i18n/sk.po
index f1b1e653266..1b201748071 100644
--- a/addons/mrp_jit/i18n/sk.po
+++ b/addons/mrp_jit/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sl.po b/addons/mrp_jit/i18n/sl.po
index c2c4ef14228..6d3ac2ec0f2 100644
--- a/addons/mrp_jit/i18n/sl.po
+++ b/addons/mrp_jit/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sr.po b/addons/mrp_jit/i18n/sr.po
index c8a77caf022..25784cbef35 100644
--- a/addons/mrp_jit/i18n/sr.po
+++ b/addons/mrp_jit/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/sv.po b/addons/mrp_jit/i18n/sv.po
index 24dfe975828..e360455a7d0 100644
--- a/addons/mrp_jit/i18n/sv.po
+++ b/addons/mrp_jit/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/tr.po b/addons/mrp_jit/i18n/tr.po
index 25e46e0b5c8..b4812345629 100644
--- a/addons/mrp_jit/i18n/tr.po
+++ b/addons/mrp_jit/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/uk.po b/addons/mrp_jit/i18n/uk.po
index 7c29b592621..6bde1fbddd8 100644
--- a/addons/mrp_jit/i18n/uk.po
+++ b/addons/mrp_jit/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/zh_CN.po b/addons/mrp_jit/i18n/zh_CN.po
index 92b4cee0895..122534f792c 100644
--- a/addons/mrp_jit/i18n/zh_CN.po
+++ b/addons/mrp_jit/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/zh_TW.po b/addons/mrp_jit/i18n/zh_TW.po
index 24dfe975828..e360455a7d0 100644
--- a/addons/mrp_jit/i18n/zh_TW.po
+++ b/addons/mrp_jit/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index 14821c63e63..90f6f94cfa0 100644
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -3,7 +3,7 @@
 <data>
 
 	# -----------------------------------------------------------
-	# 	Requisition - Automatic schedule
+	# 	Procurements - Automatic schedule
 	# -----------------------------------------------------------
 
 		<record model="workflow.transition" id="mrp.trans_confirm_confirm_wait">
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__openerp__.py
similarity index 100%
rename from addons/mrp_operations/__terp__.py
rename to addons/mrp_operations/__openerp__.py
diff --git a/addons/mrp_operations/i18n/ar.po b/addons/mrp_operations/i18n/ar.po
index cbf9009be56..61274172c3b 100644
--- a/addons/mrp_operations/i18n/ar.po
+++ b/addons/mrp_operations/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/bg.po b/addons/mrp_operations/i18n/bg.po
index 6f67e3d7203..3609bd90fb0 100644
--- a/addons/mrp_operations/i18n/bg.po
+++ b/addons/mrp_operations/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/bs.po b/addons/mrp_operations/i18n/bs.po
index 125dd2f1834..76de4ef2a85 100644
--- a/addons/mrp_operations/i18n/bs.po
+++ b/addons/mrp_operations/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/ca.po b/addons/mrp_operations/i18n/ca.po
index e77b59caf2c..46fba671f42 100644
--- a/addons/mrp_operations/i18n/ca.po
+++ b/addons/mrp_operations/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/cs.po b/addons/mrp_operations/i18n/cs.po
index cbf9009be56..61274172c3b 100644
--- a/addons/mrp_operations/i18n/cs.po
+++ b/addons/mrp_operations/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index 68cb1d0e74f..14522641e96 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index f82189d5b0c..84573accc9e 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-13 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/es_AR.po b/addons/mrp_operations/i18n/es_AR.po
index 525e18e0e92..82f7b47cafc 100644
--- a/addons/mrp_operations/i18n/es_AR.po
+++ b/addons/mrp_operations/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/et.po b/addons/mrp_operations/i18n/et.po
index f92782cd7c4..88a8c2e851b 100644
--- a/addons/mrp_operations/i18n/et.po
+++ b/addons/mrp_operations/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/fi.po b/addons/mrp_operations/i18n/fi.po
index 7fe971b8657..b6cedfade7e 100644
--- a/addons/mrp_operations/i18n/fi.po
+++ b/addons/mrp_operations/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/fr.po b/addons/mrp_operations/i18n/fr.po
index 70450cc0a57..276ad09bd22 100644
--- a/addons/mrp_operations/i18n/fr.po
+++ b/addons/mrp_operations/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index cbf9009be56..4d8a2f7dccf 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/hu.po b/addons/mrp_operations/i18n/hu.po
index cbf9009be56..4d8a2f7dccf 100644
--- a/addons/mrp_operations/i18n/hu.po
+++ b/addons/mrp_operations/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/id.po b/addons/mrp_operations/i18n/id.po
index 68f1d56e823..6b4de346d62 100644
--- a/addons/mrp_operations/i18n/id.po
+++ b/addons/mrp_operations/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/it.po b/addons/mrp_operations/i18n/it.po
index e436ef5cb97..c8f2274eda9 100644
--- a/addons/mrp_operations/i18n/it.po
+++ b/addons/mrp_operations/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/ko.po b/addons/mrp_operations/i18n/ko.po
index 6680d613b66..58268bb9a97 100644
--- a/addons/mrp_operations/i18n/ko.po
+++ b/addons/mrp_operations/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/lt.po b/addons/mrp_operations/i18n/lt.po
index cbf9009be56..4d8a2f7dccf 100644
--- a/addons/mrp_operations/i18n/lt.po
+++ b/addons/mrp_operations/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/nl.po b/addons/mrp_operations/i18n/nl.po
index c0df9b664b6..faafc29c3e1 100644
--- a/addons/mrp_operations/i18n/nl.po
+++ b/addons/mrp_operations/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/nl_BE.po b/addons/mrp_operations/i18n/nl_BE.po
index 6585b22152c..8454a064461 100644
--- a/addons/mrp_operations/i18n/nl_BE.po
+++ b/addons/mrp_operations/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/pl.po b/addons/mrp_operations/i18n/pl.po
index 3669860decd..e615ef1a3cd 100644
--- a/addons/mrp_operations/i18n/pl.po
+++ b/addons/mrp_operations/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/pt.po b/addons/mrp_operations/i18n/pt.po
index 0de05bb12d8..a3b9d430520 100644
--- a/addons/mrp_operations/i18n/pt.po
+++ b/addons/mrp_operations/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/pt_BR.po b/addons/mrp_operations/i18n/pt_BR.po
index 51b7e575f0d..72674905663 100644
--- a/addons/mrp_operations/i18n/pt_BR.po
+++ b/addons/mrp_operations/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/ro.po b/addons/mrp_operations/i18n/ro.po
index c75528ac2df..4c74cc0931c 100644
--- a/addons/mrp_operations/i18n/ro.po
+++ b/addons/mrp_operations/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/ru.po b/addons/mrp_operations/i18n/ru.po
index 67b9a08c691..21999fb891d 100644
--- a/addons/mrp_operations/i18n/ru.po
+++ b/addons/mrp_operations/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-04 05:52+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-13 06:10+0000\n"
+"Last-Translator: grisha <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-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -128,7 +128,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_code_action
 msgid "Start - Stop Codes"
-msgstr ""
+msgstr "Штрих-коды Старт/Стоп"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
diff --git a/addons/mrp_operations/i18n/sl.po b/addons/mrp_operations/i18n/sl.po
index a948dae45c8..505f9ed5e43 100644
--- a/addons/mrp_operations/i18n/sl.po
+++ b/addons/mrp_operations/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/sv.po b/addons/mrp_operations/i18n/sv.po
index 660e72115ab..c0f7cec656a 100644
--- a/addons/mrp_operations/i18n/sv.po
+++ b/addons/mrp_operations/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/tlh.po b/addons/mrp_operations/i18n/tlh.po
index 75fd4963a92..f1d3b2855be 100644
--- a/addons/mrp_operations/i18n/tlh.po
+++ b/addons/mrp_operations/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index 08edf335a2b..d3e58c3785c 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/uk.po b/addons/mrp_operations/i18n/uk.po
index 4e867456118..cb369f396c5 100644
--- a/addons/mrp_operations/i18n/uk.po
+++ b/addons/mrp_operations/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index 7fb67a60ab8..aa884ecb4ba 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/zh_TW.po b/addons/mrp_operations/i18n/zh_TW.po
index 6c5ded7acdd..0c76cf90307 100644
--- a/addons/mrp_operations/i18n/zh_TW.po
+++ b/addons/mrp_operations/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index db71eade19c..fccc62edab7 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-	<menuitem id="menu_mrp_planning" name="Planning" parent="base.menu_mrp_root" sequence="2"/>
+    <menuitem id="menu_mrp_planning" name="Planning"
+        parent="base.menu_mrp_root" sequence="2"
+        groups="base.group_extended"/>
     <record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit">
         <field name="name">mrp.production.workcenter.line.tree</field>
         <field name="model">mrp.production.workcenter.line</field>
@@ -68,7 +70,7 @@
 
                     <separator string="Status" colspan="4"/>
                     <group colspan="8" col="8">
-                        <field name="state" select="2"/>
+                        <field name="state"/>
                         <button name="button_draft" string="Set Draft" states="cancel"/>
                         <button name="button_start_working" string="Start" states="draft"/>
                         <button name="button_resume" string="Resume" states="pause"/>
@@ -175,12 +177,21 @@
 
     </record>
 
-    <menuitem action="mrp.mrp_production_action" id="menu_mrp_production_order_action" parent="menu_mrp_planning" sequence="1"/>
-    <menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing" id="menu_mrp_production_wc_order" action="mrp_production_wc_action_form"/>
-	<menuitem name="Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action_planning" action="mrp_production_wc_action_planning" sequence="2"/>
-<!--    <menuitem name="All Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>-->
+    <menuitem action="mrp.mrp_production_action"
+        id="menu_mrp_production_order_action"
+        parent="menu_mrp_planning" sequence="1"
+        groups="base.group_extended"/>
+    <menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing"
+        id="menu_mrp_production_wc_order"
+        action="mrp_production_wc_action_form"
+        groups="base.group_extended"/>
+    <menuitem name="Work Orders" parent="menu_mrp_planning"
+        id="menu_mrp_production_wc_action_planning"
+        action="mrp_production_wc_action_planning"
+        sequence="2"
+        groups="base.group_extended"/>
 
-<!-- Operation codes -->
+    <!-- Operation codes -->
 
     <record model="ir.ui.view" id="mrp_production_code_tree_view">
         <field name="name">mrp.production.code.tree</field>
@@ -194,7 +205,6 @@
             </tree>
         </field>
     </record>
-
     <record model="ir.ui.view" id="mrp_production_code_form_view">
         <field name="name">mrp.production.code.form</field>
         <field name="model">mrp_operations.operation.code</field>
@@ -217,9 +227,7 @@
         <field name="view_id" ref="mrp_production_code_tree_view"/>
     </record>
 
-<!--    <menuitem name="Start - Stop Codes" parent="menu_mrp_planning" id="menu_mrp_production_code_action" action="mrp_production_code_action"/>-->
-
-<!-- Operations -->
+    <!-- Operations -->
 
     <record model="ir.ui.view" id="mrp_production_operation_tree_view">
         <field name="name">mrp.production.operation.tree</field>
@@ -250,21 +258,6 @@
             </field>
         </record>
 
-
-
-    <!--<record model="ir.ui.view" id="mrp_production_operation_form_view">
-        <field name="name">mrp.production.operation.form</field>
-        <field name="model">mrp_operations.operation</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Production Operation">
-                <field name="production_id" select="1"/>
-                <field name="workcenter_id" select="1"/>
-                <field name="code_id" select="1"/>
-            </form>
-        </field>
-    </record>
--->
     <record model="ir.actions.act_window" id="mrp_production_operation_action">
         <field name="name">Operations</field>
         <field name="type">ir.actions.act_window</field>
@@ -273,13 +266,6 @@
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="mrp_production_operation_tree_view"/>
     </record>
-
-<!--    <menuitem-->
-<!--        name="Work Order Events Using Bar Codes"-->
-<!--        parent="menu_mrp_planning"-->
-<!--        id="menu_mrp_production_operation_action"-->
-<!--        action="mrp_production_operation_action"/>-->
-
     <record id="mrp_production_reorder_form_view" model="ir.ui.view">
         <field name="name">mrp.production.allow_reorder.form</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__openerp__.py
similarity index 100%
rename from addons/mrp_repair/__terp__.py
rename to addons/mrp_repair/__openerp__.py
diff --git a/addons/mrp_repair/i18n/ar.po b/addons/mrp_repair/i18n/ar.po
index b00991a5ca3..3f58afc56ee 100644
--- a/addons/mrp_repair/i18n/ar.po
+++ b/addons/mrp_repair/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/bg.po b/addons/mrp_repair/i18n/bg.po
index 6827018015c..7a9b8064762 100644
--- a/addons/mrp_repair/i18n/bg.po
+++ b/addons/mrp_repair/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/bs.po b/addons/mrp_repair/i18n/bs.po
index a70becb3a19..bb11c0491bf 100644
--- a/addons/mrp_repair/i18n/bs.po
+++ b/addons/mrp_repair/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/ca.po b/addons/mrp_repair/i18n/ca.po
index e4cda513456..51ff98ab0e4 100644
--- a/addons/mrp_repair/i18n/ca.po
+++ b/addons/mrp_repair/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/cs.po b/addons/mrp_repair/i18n/cs.po
index 96016c0e412..f00cdff8989 100644
--- a/addons/mrp_repair/i18n/cs.po
+++ b/addons/mrp_repair/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/de.po b/addons/mrp_repair/i18n/de.po
index 06e92048212..379fced883d 100644
--- a/addons/mrp_repair/i18n/de.po
+++ b/addons/mrp_repair/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index 43480bac5b9..661cae1aa7f 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/es_AR.po b/addons/mrp_repair/i18n/es_AR.po
index 4cff1683c37..04e93f84bcb 100644
--- a/addons/mrp_repair/i18n/es_AR.po
+++ b/addons/mrp_repair/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/et.po b/addons/mrp_repair/i18n/et.po
index 7bcb6bc3fd2..20eeea1f7c8 100644
--- a/addons/mrp_repair/i18n/et.po
+++ b/addons/mrp_repair/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/fi.po b/addons/mrp_repair/i18n/fi.po
index 64a23fb1d03..35908f347d2 100644
--- a/addons/mrp_repair/i18n/fi.po
+++ b/addons/mrp_repair/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/fr.po b/addons/mrp_repair/i18n/fr.po
index 842fa48d2c6..3b0cee4ea95 100644
--- a/addons/mrp_repair/i18n/fr.po
+++ b/addons/mrp_repair/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/hr.po b/addons/mrp_repair/i18n/hr.po
index b00991a5ca3..3f58afc56ee 100644
--- a/addons/mrp_repair/i18n/hr.po
+++ b/addons/mrp_repair/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/hu.po b/addons/mrp_repair/i18n/hu.po
index b00991a5ca3..3f58afc56ee 100644
--- a/addons/mrp_repair/i18n/hu.po
+++ b/addons/mrp_repair/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/id.po b/addons/mrp_repair/i18n/id.po
index 57c1bb20d3e..f20ccd05cbf 100644
--- a/addons/mrp_repair/i18n/id.po
+++ b/addons/mrp_repair/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index b0e38411c04..f8e8c4344b1 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/ko.po b/addons/mrp_repair/i18n/ko.po
index dcea75f2b14..cb9f59ce620 100644
--- a/addons/mrp_repair/i18n/ko.po
+++ b/addons/mrp_repair/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/lt.po b/addons/mrp_repair/i18n/lt.po
index b00991a5ca3..3f58afc56ee 100644
--- a/addons/mrp_repair/i18n/lt.po
+++ b/addons/mrp_repair/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/nl.po b/addons/mrp_repair/i18n/nl.po
index 6692277b989..2a265485163 100644
--- a/addons/mrp_repair/i18n/nl.po
+++ b/addons/mrp_repair/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/nl_BE.po b/addons/mrp_repair/i18n/nl_BE.po
index 317dc449191..37714187b98 100644
--- a/addons/mrp_repair/i18n/nl_BE.po
+++ b/addons/mrp_repair/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/pl.po b/addons/mrp_repair/i18n/pl.po
index 1981d90f3f8..dcb893d70af 100644
--- a/addons/mrp_repair/i18n/pl.po
+++ b/addons/mrp_repair/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/pt.po b/addons/mrp_repair/i18n/pt.po
index e9e0dc94dc6..e461adf9950 100644
--- a/addons/mrp_repair/i18n/pt.po
+++ b/addons/mrp_repair/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/pt_BR.po b/addons/mrp_repair/i18n/pt_BR.po
index e5b4094bcef..e089dd7350d 100644
--- a/addons/mrp_repair/i18n/pt_BR.po
+++ b/addons/mrp_repair/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/ro.po b/addons/mrp_repair/i18n/ro.po
index b00991a5ca3..3f58afc56ee 100644
--- a/addons/mrp_repair/i18n/ro.po
+++ b/addons/mrp_repair/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/ru.po b/addons/mrp_repair/i18n/ru.po
index d2297fa5fcb..f80ff51be2a 100644
--- a/addons/mrp_repair/i18n/ru.po
+++ b/addons/mrp_repair/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/sl.po b/addons/mrp_repair/i18n/sl.po
index d7ddf41ff9f..fd1506a6d9c 100644
--- a/addons/mrp_repair/i18n/sl.po
+++ b/addons/mrp_repair/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/sv.po b/addons/mrp_repair/i18n/sv.po
index 5e6d08fc52b..993315a662e 100644
--- a/addons/mrp_repair/i18n/sv.po
+++ b/addons/mrp_repair/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/tlh.po b/addons/mrp_repair/i18n/tlh.po
index c4d0dbb58e0..0dbbfa234c7 100644
--- a/addons/mrp_repair/i18n/tlh.po
+++ b/addons/mrp_repair/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 360da93ec0c..509b611b47d 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/uk.po b/addons/mrp_repair/i18n/uk.po
index 03e6b4b313f..5341e2b4770 100644
--- a/addons/mrp_repair/i18n/uk.po
+++ b/addons/mrp_repair/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/zh_CN.po b/addons/mrp_repair/i18n/zh_CN.po
index c8eabc9a984..4279d1e6ba2 100644
--- a/addons/mrp_repair/i18n/zh_CN.po
+++ b/addons/mrp_repair/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/zh_TW.po b/addons/mrp_repair/i18n/zh_TW.po
index b1739e5af10..7323d0260ef 100644
--- a/addons/mrp_repair/i18n/zh_TW.po
+++ b/addons/mrp_repair/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 2045acae1f1..9f629ad8a46 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -9,17 +9,17 @@
             <field name="arch" type="xml">
                 <form string="Repairs order">
                     <group col="6" colspan="4">
-                    	<field name="name"/>
+                        <field name="name"/>
                         <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
                         <field name="deliver_bool"/>
-                    	<newline/>
-                        <field name="prodlot_id" select="2" on_change="onchange_lot_id(prodlot_id,product_id)"/>
+                        <newline/>
+                        <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
                         <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
                         <field name="repaired"/>
-                    	<newline/>
-                        <field name="partner_id" select="2" on_change="onchange_partner_id(partner_id,address_id)"/>
+                        <newline/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
                         <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
-                    	<field name="invoiced"/>
+                        <field name="invoiced"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Operations">
@@ -29,25 +29,25 @@
                                 <form string="Operations">
                                     <notebook>
                                         <page string="Repair Line">
-		                                    <field name="name" colspan="4"/>
-		                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" colspan="4"/>
-		                                    <field name="product_uom_qty" string="Qty" />
-		                                    <field name="product_uom" string="UoM"/>
-		                                    <field name="price_unit"/>
-		                                    <field name="price_subtotal"/>
-		                                    <field name="location_id"/>
-		                                    <field name="location_dest_id"/>
+                                            <field name="name" colspan="4"/>
+                                            <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" colspan="4"/>
+                                            <field name="product_uom_qty" string="Qty" />
+                                            <field name="product_uom" string="UoM"/>
+                                            <field name="price_unit"/>
+                                            <field name="price_subtotal"/>
+                                            <field name="location_id"/>
+                                            <field name="location_dest_id"/>
                                             <newline/>
                                             <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
                                             <group colspan="2">
                                                 <field name="to_invoice"/>
-    		                                    <field name="invoiced"/>
+                                                <field name="invoiced"/>
                                             </group>
                                             <newline/>
                                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <separator colspan="4" string="States"/>
                                             <field name="state"/>
-										</page>
+                                        </page>
                                         <page string="History" groups="base.group_extended">
                                             <field colspan="4" name="move_id" />
                                             <field colspan="4" name="invoice_line_id"/>
@@ -78,7 +78,7 @@
                             </group>
                             <newline/>
                             <group col="13" colspan="4">
-                                <field name="state" select="2"/>
+                                <field name="state"/>
                                 <button name="repair_confirm" states="draft" string="Confirm Repair"/>
                                 <button name="repair_ready" states="confirmed" string="Start Repair"/>
                                 <button name="action_repair_start" states="ready" string="Start Repair"/>
@@ -93,10 +93,12 @@
                             </group>
                         </page>
                         <page string="Invoicing">
-                            <field name="invoice_method" colspan="4" />
-                            <field name="pricelist_id" context="product_id=product_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                            <field name="invoice_method" colspan="4"/>
+                            <field
+                                name="pricelist_id" context="product_id=product_id"
+                                attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
                             <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
-                            <!--<field name="invoice_id"/>-->
+                            <!-- <field name="invoice_id"/> -->
                             <field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
                                 <form string="Fees">
                                     <notebook>
@@ -115,7 +117,7 @@
                                             <newline/>
                                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&gt;&gt;','purchase')]"/>
                                          </page>
-										 <page string="History" groups="base.group_extended">
+                                         <page string="History" groups="base.group_extended">
                                             <field colspan="4" name="invoice_line_id" />
                                         </page>
                                       </notebook>
@@ -154,13 +156,13 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Repairs order">
-                	<field name="name" select="1" />
+                    <field name="name" select="1" />
                         <field name="product_id" select="1" />
-                        <field name="prodlot_id" select="2"/>
-                        <field name="partner_id" select="2"/>
+                        <field name="prodlot_id"/>
+                        <field name="partner_id"/>
                         <field name="address_id"/>
                             <field name="location_id"/>
-                            <field name="state" select="2"/>
+                            <field name="state"/>
                             <field name="move_id"/>
                             <field name="location_dest_id"/>
                             <field name="guarantee_limit"/>
@@ -191,7 +193,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
-        	<field name="filter" eval="True"/>
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_repair_progress_tree" model="ir.actions.act_window">
@@ -201,7 +203,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','under_repair')]</field>
-        	<field name="filter" eval="True"/>
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_repair_ready_tree" model="ir.actions.act_window">
@@ -211,7 +213,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','!=','draft'),('state','!=','under_repair'),('state','!=','2binvoiced'),('state','!=','invoice_except'),('state','!=','done'),('state','!=','cancel'),]</field>
-        	<field name="filter" eval="True"/>
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_repair_2binvoiced_tree" model="ir.actions.act_window">
diff --git a/addons/mrp_subproduct/__terp__.py b/addons/mrp_subproduct/__openerp__.py
similarity index 100%
rename from addons/mrp_subproduct/__terp__.py
rename to addons/mrp_subproduct/__openerp__.py
diff --git a/addons/mrp_subproduct/i18n/ab.po b/addons/mrp_subproduct/i18n/ab.po
index b2bbef5acf5..159fce8ea12 100644
--- a/addons/mrp_subproduct/i18n/ab.po
+++ b/addons/mrp_subproduct/i18n/ab.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ar.po b/addons/mrp_subproduct/i18n/ar.po
index 1878cdd22be..4a61d4f020e 100644
--- a/addons/mrp_subproduct/i18n/ar.po
+++ b/addons/mrp_subproduct/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/bg.po b/addons/mrp_subproduct/i18n/bg.po
index 877e408fb69..f387c575ba3 100644
--- a/addons/mrp_subproduct/i18n/bg.po
+++ b/addons/mrp_subproduct/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/bs.po b/addons/mrp_subproduct/i18n/bs.po
index bfba9772bc7..28556f9b90e 100644
--- a/addons/mrp_subproduct/i18n/bs.po
+++ b/addons/mrp_subproduct/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ca.po b/addons/mrp_subproduct/i18n/ca.po
index 2925009366a..5c40c9da00d 100644
--- a/addons/mrp_subproduct/i18n/ca.po
+++ b/addons/mrp_subproduct/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/cs.po b/addons/mrp_subproduct/i18n/cs.po
index eb351e6d476..00e394cae86 100644
--- a/addons/mrp_subproduct/i18n/cs.po
+++ b/addons/mrp_subproduct/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_subproduct/i18n/de.po
index b6327e82811..3ac5dfbe0f2 100644
--- a/addons/mrp_subproduct/i18n/de.po
+++ b/addons/mrp_subproduct/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index 2365b64eb9b..0e64cdee6ab 100644
--- a/addons/mrp_subproduct/i18n/es.po
+++ b/addons/mrp_subproduct/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/es_AR.po b/addons/mrp_subproduct/i18n/es_AR.po
index ad81695bd35..e70d4b1b660 100644
--- a/addons/mrp_subproduct/i18n/es_AR.po
+++ b/addons/mrp_subproduct/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/et.po b/addons/mrp_subproduct/i18n/et.po
index 6afe5de7174..a57449fa45d 100644
--- a/addons/mrp_subproduct/i18n/et.po
+++ b/addons/mrp_subproduct/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/fi.po b/addons/mrp_subproduct/i18n/fi.po
index 11d49b93a38..bde83751ecd 100644
--- a/addons/mrp_subproduct/i18n/fi.po
+++ b/addons/mrp_subproduct/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/fr.po b/addons/mrp_subproduct/i18n/fr.po
index eeef23e871a..74abe339395 100644
--- a/addons/mrp_subproduct/i18n/fr.po
+++ b/addons/mrp_subproduct/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_subproduct/i18n/hr.po
index c592058271c..168e25f3a19 100644
--- a/addons/mrp_subproduct/i18n/hr.po
+++ b/addons/mrp_subproduct/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/hu.po b/addons/mrp_subproduct/i18n/hu.po
index 1878cdd22be..4a61d4f020e 100644
--- a/addons/mrp_subproduct/i18n/hu.po
+++ b/addons/mrp_subproduct/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/id.po b/addons/mrp_subproduct/i18n/id.po
index 83d672c1606..64f7b55cde2 100644
--- a/addons/mrp_subproduct/i18n/id.po
+++ b/addons/mrp_subproduct/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/it.po b/addons/mrp_subproduct/i18n/it.po
index 21938d490a9..af5cfbceff3 100644
--- a/addons/mrp_subproduct/i18n/it.po
+++ b/addons/mrp_subproduct/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ko.po b/addons/mrp_subproduct/i18n/ko.po
index 5ba261c6651..f624e5230b6 100644
--- a/addons/mrp_subproduct/i18n/ko.po
+++ b/addons/mrp_subproduct/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/lt.po b/addons/mrp_subproduct/i18n/lt.po
index 1878cdd22be..4a61d4f020e 100644
--- a/addons/mrp_subproduct/i18n/lt.po
+++ b/addons/mrp_subproduct/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/nl.po b/addons/mrp_subproduct/i18n/nl.po
index b3a0f86b221..cd36ca37f28 100644
--- a/addons/mrp_subproduct/i18n/nl.po
+++ b/addons/mrp_subproduct/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/nl_BE.po b/addons/mrp_subproduct/i18n/nl_BE.po
index 39eac2d0f11..4678c34e63c 100644
--- a/addons/mrp_subproduct/i18n/nl_BE.po
+++ b/addons/mrp_subproduct/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/oc.po b/addons/mrp_subproduct/i18n/oc.po
index 48a1a3ac407..daf7ecff9c9 100644
--- a/addons/mrp_subproduct/i18n/oc.po
+++ b/addons/mrp_subproduct/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/pl.po b/addons/mrp_subproduct/i18n/pl.po
index b6005539157..8e6a3f34142 100644
--- a/addons/mrp_subproduct/i18n/pl.po
+++ b/addons/mrp_subproduct/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_subproduct/i18n/pt.po
index c2b9f54ccac..f50f76615d9 100644
--- a/addons/mrp_subproduct/i18n/pt.po
+++ b/addons/mrp_subproduct/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/pt_BR.po b/addons/mrp_subproduct/i18n/pt_BR.po
index 8caea411f4e..854bab7a06e 100644
--- a/addons/mrp_subproduct/i18n/pt_BR.po
+++ b/addons/mrp_subproduct/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ro.po b/addons/mrp_subproduct/i18n/ro.po
index 9bd1ca89c44..7ef3cffd1ef 100644
--- a/addons/mrp_subproduct/i18n/ro.po
+++ b/addons/mrp_subproduct/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/ru.po b/addons/mrp_subproduct/i18n/ru.po
index d9f6b7f1e0a..07c01905f74 100644
--- a/addons/mrp_subproduct/i18n/ru.po
+++ b/addons/mrp_subproduct/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/sk.po b/addons/mrp_subproduct/i18n/sk.po
index 21f34fd118d..1ae313bcecd 100644
--- a/addons/mrp_subproduct/i18n/sk.po
+++ b/addons/mrp_subproduct/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/sl.po b/addons/mrp_subproduct/i18n/sl.po
index 0aff8a783f5..b307a6f12db 100644
--- a/addons/mrp_subproduct/i18n/sl.po
+++ b/addons/mrp_subproduct/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/sv.po b/addons/mrp_subproduct/i18n/sv.po
index 66c77ec37db..63e37ea7eef 100644
--- a/addons/mrp_subproduct/i18n/sv.po
+++ b/addons/mrp_subproduct/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/tlh.po b/addons/mrp_subproduct/i18n/tlh.po
index 7498edf862a..0dce6cb3bb9 100644
--- a/addons/mrp_subproduct/i18n/tlh.po
+++ b/addons/mrp_subproduct/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index bab7b7e955f..096ca3d2718 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/uk.po b/addons/mrp_subproduct/i18n/uk.po
index 58be3216af8..034e77dad69 100644
--- a/addons/mrp_subproduct/i18n/uk.po
+++ b/addons/mrp_subproduct/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_subproduct/i18n/zh_CN.po
index b12bdda0244..8b4c7218d1a 100644
--- a/addons/mrp_subproduct/i18n/zh_CN.po
+++ b/addons/mrp_subproduct/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/zh_TW.po b/addons/mrp_subproduct/i18n/zh_TW.po
index b2f3a7b1778..9ac28cba727 100644
--- a/addons/mrp_subproduct/i18n/zh_TW.po
+++ b/addons/mrp_subproduct/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__openerp__.py
similarity index 100%
rename from addons/multi_company/__terp__.py
rename to addons/multi_company/__openerp__.py
diff --git a/addons/multi_company/i18n/ar.po b/addons/multi_company/i18n/ar.po
index c98bbfb5d5b..7f111ad33f4 100644
--- a/addons/multi_company/i18n/ar.po
+++ b/addons/multi_company/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/bg.po b/addons/multi_company/i18n/bg.po
index df76ea8f415..67b48cf31a5 100644
--- a/addons/multi_company/i18n/bg.po
+++ b/addons/multi_company/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/bs.po b/addons/multi_company/i18n/bs.po
index befc608ddfe..071066a5b5c 100644
--- a/addons/multi_company/i18n/bs.po
+++ b/addons/multi_company/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/ca.po b/addons/multi_company/i18n/ca.po
index 6485c39dda3..fa5481040f0 100644
--- a/addons/multi_company/i18n/ca.po
+++ b/addons/multi_company/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/cs.po b/addons/multi_company/i18n/cs.po
index 1814509163b..2a35fe0a175 100644
--- a/addons/multi_company/i18n/cs.po
+++ b/addons/multi_company/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/de.po b/addons/multi_company/i18n/de.po
index 60adc32d95d..067f534f23a 100644
--- a/addons/multi_company/i18n/de.po
+++ b/addons/multi_company/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index 4497a62e37d..1f5b404de6d 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/et.po b/addons/multi_company/i18n/et.po
index 5d68b2fc547..43847a0c724 100644
--- a/addons/multi_company/i18n/et.po
+++ b/addons/multi_company/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/fi.po b/addons/multi_company/i18n/fi.po
index 242368a487a..b63ed06a083 100644
--- a/addons/multi_company/i18n/fi.po
+++ b/addons/multi_company/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/fr.po b/addons/multi_company/i18n/fr.po
index 2f9c722d109..2e6f71b23d4 100644
--- a/addons/multi_company/i18n/fr.po
+++ b/addons/multi_company/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/hr.po b/addons/multi_company/i18n/hr.po
index 2fbfb8fbf19..ec53c66057a 100644
--- a/addons/multi_company/i18n/hr.po
+++ b/addons/multi_company/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/hu.po b/addons/multi_company/i18n/hu.po
index d44f803f2a8..65c11c82613 100644
--- a/addons/multi_company/i18n/hu.po
+++ b/addons/multi_company/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/id.po b/addons/multi_company/i18n/id.po
index ac1ece82853..2ddb2f1a98d 100644
--- a/addons/multi_company/i18n/id.po
+++ b/addons/multi_company/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index 07f5c0bb8aa..e817d7b073b 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/lt.po b/addons/multi_company/i18n/lt.po
index 3e11fb327a5..44e3bda0ed4 100644
--- a/addons/multi_company/i18n/lt.po
+++ b/addons/multi_company/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/nl.po b/addons/multi_company/i18n/nl.po
index 075ef27b97e..468acb3dd9f 100644
--- a/addons/multi_company/i18n/nl.po
+++ b/addons/multi_company/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/oc.po b/addons/multi_company/i18n/oc.po
index dd1369fef46..a278b19e77a 100644
--- a/addons/multi_company/i18n/oc.po
+++ b/addons/multi_company/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/pl.po b/addons/multi_company/i18n/pl.po
index 3ebf20dcd29..d06788eadf4 100644
--- a/addons/multi_company/i18n/pl.po
+++ b/addons/multi_company/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/pt.po b/addons/multi_company/i18n/pt.po
index 4174c7c3417..e6149fec18c 100644
--- a/addons/multi_company/i18n/pt.po
+++ b/addons/multi_company/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/pt_BR.po b/addons/multi_company/i18n/pt_BR.po
index 78439ca10f3..02d1720465b 100644
--- a/addons/multi_company/i18n/pt_BR.po
+++ b/addons/multi_company/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/ro.po b/addons/multi_company/i18n/ro.po
index bc44dfec3cc..6bf35d56dda 100644
--- a/addons/multi_company/i18n/ro.po
+++ b/addons/multi_company/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po
index 66c14c3c896..4a4b6d3e720 100644
--- a/addons/multi_company/i18n/ru.po
+++ b/addons/multi_company/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/sl.po b/addons/multi_company/i18n/sl.po
index 55868aabe25..a13cbd5c7c9 100644
--- a/addons/multi_company/i18n/sl.po
+++ b/addons/multi_company/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/sv.po b/addons/multi_company/i18n/sv.po
index 7c66f7b2bd0..90abdba3985 100644
--- a/addons/multi_company/i18n/sv.po
+++ b/addons/multi_company/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/tr.po b/addons/multi_company/i18n/tr.po
index 453c5fdb8a1..6e0236e663d 100644
--- a/addons/multi_company/i18n/tr.po
+++ b/addons/multi_company/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/uk.po b/addons/multi_company/i18n/uk.po
index 9a30ea63378..8ed45556de3 100644
--- a/addons/multi_company/i18n/uk.po
+++ b/addons/multi_company/i18n/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/zh_CN.po b/addons/multi_company/i18n/zh_CN.po
index 4ccb756d28d..6ead84a5fe3 100644
--- a/addons/multi_company/i18n/zh_CN.po
+++ b/addons/multi_company/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/zh_TW.po b/addons/multi_company/i18n/zh_TW.po
index 7fab8e4b248..5292c9cc754 100644
--- a/addons/multi_company/i18n/zh_TW.po
+++ b/addons/multi_company/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/olap/__terp__.py b/addons/olap/__openerp__.py
similarity index 100%
rename from addons/olap/__terp__.py
rename to addons/olap/__openerp__.py
diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
index 05be10fd8a5..c3f43b89740 100644
--- a/addons/olap/data/olap_cube_view.xml
+++ b/addons/olap/data/olap_cube_view.xml
@@ -1,642 +1,676 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+	<data>
 
-<!-- Wizard view for the load data -->
-
-        <record id="bi_load_db_form" model="ir.ui.view">
-            <field name="name">bi.load.db.form</field>
-            <field name="model">bi.load.db.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Load Database Tables">
-                    <label align="0.0" string="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." colspan="4" />
-                    <newline/>
-                    <label align="0.0" string="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:" colspan="4"/>
-                    <newline/>
-                    <field name="fact_table" />
-                    <field name="db_name" />
-                    <newline/>
-                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
-                    <button name="action_load" string="Load Data Structure" type="object"  colspan="2"/>
-                </form>
-            </field>
-        </record>
-        <record id="act_bi_load_db_wizard" model="ir.actions.act_window">
-            <field name="name">Load database Structure</field>
-            <field name="res_model">bi.load.db.wizard</field>
-            <field name="src_model">olap.schema</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="auto_refresh" eval="1"/>
-            <field name="target">new</field>
-        </record>
-
-
-<!-- Wizard For Olap Warehouse -->
-
-        <record id="view_warehouse_bi" model="ir.ui.view">
-            <field name="name">Olap Warehouse</field>
-            <field name="model">olap.warehouse.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Warehouse">
-                    <group colspan="16">
-                    <separator string="Query" colspan="16"/>
-                    <field name="query" nolabel="1" colspan="16"/>
-                    <button string="Ok" name="action_ok" colspan="16" type="object" icon='gtk-ok'/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_olap_warehouse" model="ir.actions.act_window">
-            <field name="name">Olap Warehouse</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">olap.warehouse.wizard</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem
-        name="Olap Warehouse"
-        action="action_olap_warehouse"
-        id="menu_bi_warehouse"
-        sequence="51"
-        parent="base.next_id_50"
-        />
-
-<!-- Wizard View for the parameters wizard -->
-
-        <record id="view_config_bi" model="ir.ui.view">
-            <field name="name">Parameters Configuration</field>
-            <field name="model">olap.parameters.config.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Parameters Configure">
-                    <separator string="BI Web Client." colspan="4"/>
-                    <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
-                    <field name="host_name" colspan="4"/>
-                    <field name="host_port" colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2">
-                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
-                        <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_config_bi_parameters" model="ir.actions.act_window">
-            <field name="name">Parameters Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">olap.parameters.config.wizard</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-        <menuitem
-        name="Server Parameters"
-        action="action_config_bi_parameters"
-        id="menu_bi_server_parameters"
-        sequence="50"
-        parent="base.next_id_50"
-        />
-        <record model="ir.actions.todo" id="config_auto_directory">
-            <field name="name">Server Parameters Configuration</field>
-            <field name="note">This wizard will configure the URL of the web client</field>
-            <field name="action_id" ref="action_config_bi_parameters"/>
-        </record>
-
-
-<!-- Wizard view for the Auto Configuring the data -->
-
-        <record id="bi_auto_configure_form" model="ir.ui.view">
-            <field name="name">bi.auto.configure.form</field>
-            <field name="model">bi.auto.configure.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Auto Congifuring Tables">
-                    <label align="0.0" string="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." colspan="4" />
-                    <field name="name" select="1" colspan="4"/>
-                    <newline/>
-                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
-                    <button name="action_load" string="Auto Configure Structure" type="object"  colspan="2"/>
-                </form>
-            </field>
-        </record>
-        <record id="act_bi_auto_configure" model="ir.actions.act_window">
-            <field name="name">Auto Configuration</field>
-            <field name="res_model">bi.auto.configure.wizard</field>
-            <field name="src_model">olap.schema</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="auto_refresh" eval="1"/>
-            <field name="target">new</field>
-        </record>
-
-
-
-    # ------------------------------------------------------------------
-    # Olap Schema
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_schema_tree">
-        <field name="name">olap.schema.tree</field>
-        <field name="model">olap.schema</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Schema">
-                <field name="name"/>
-                <field name="database_id"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_olap_schema_form">
-        <field name="name">olap.schema.form</field>
-        <field name="model">olap.schema</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap Schema">
-              <field name="name" select="1" colspan="4"/>
-              <field name="database_id" select="2" colspan="4"/>
-              <field name="loaded" colspan="3"/>
-              <button name="%(act_bi_load_db_wizard)d" string="Reload Structure" type="action" states="done"/>
-              <field name="configure" colspan="3"/>
-              <button name="%(bi_load_configuration_table)d"
-              	string="ReConfigure Structure" type="action"
-              	states="done" />
-              <field name="ready" select="2" colspan="3"/>
-              <field name="note" colspan="4"/>
-              <field name="state" select="2" colspan="2" />
-              <group colspan="2">
-                <button string="Connect to Database" name="dbconnect" states="none"/>
-                <button string="Load Database Structure"
-                	name="%(act_bi_load_db_wizard)d" type="action"
-                	states="dbconnect" target="new" />
-                <button string="Configure Manually" name="dbconfigure"  states="dbload"/>
-                <button string="Mark as Configured" name="dbready" states="dbconfigure"/>
-              </group>
-              <separator string="Auto Application Configuration" colspan="4"/>
-              <field name="app_detect" nolabel="1" colspan="3"/>
-              <button string="Configure Automatically "
-              	name="%(act_bi_auto_configure)d" type="action"
-              	states="dbload" target="new" />
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_schema_form">
-        <field name="name">Olap Schemas</field>
-        <field name="res_model">olap.schema</field>
-        <field name="view_type">form</field>
-
-    </record>
-    <menuitem
-        name="Olap Schema"
-        action="action_olap_schema_form"
-        id="menu_action_olap_schema_form"
-        parent="menu_bi_conf_cubes"/>
-
-    # ------------------------------------------------------------------
-    # Olap Cubes Table
-    # ------------------------------------------------------------------
-    <record model="ir.ui.view" id="view_olap_cube_table_form">
-        <field name="name">olap.cube.table.form</field>
-        <field name="model">olap.cube.table</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap cube_table" >
-                <field name="name" select="2"/>
-                <field name="column_link_id" context="{'fk':True,'dim_x':context.get('d_id',False)}"/>
-                <newline/>
-                <separator colspan="2" string="Joined Tables"/>
-                <field invisible="True" name="line_ids" nolabel="1">
-                    <form string="Database Tables">
-                        <field name="table_id"/>
-                        <field name="field_id"/>
-                    </form>
-                    <tree string="Database Tables">
-                        <field name="table_id"/>
-                        <field name="field_id"/>
-                    </tree>
-                </field>
-                <field name="available_table_ids" colspan="4"
-                	nolabel="1" readonly="0"
-                	domain="[('available_table_ids','in',available_table_ids)]"
-                	context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
-                	<tree string="Database Tables">
-                		<field name="related_to" string="Joined Table" />
-                		<field name="name" />
-                		<field name="table_id" />
-                		<field name="primary_key" />
-                	</tree>
-                </field>
-            </form>
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="action_olap_cube_table_form">
-        <field name="name">Olap Cube Tables</field>
-        <field name="res_model">olap.cube.table</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Cubes Table"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_cube_table_form"
-        id="menu_action_olap_cube_table_form"/>
-
-    # ------------------------------------------------------------------
-    # Olap Cubes
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_cube_tree">
-        <field name="name">olap.cube.tree</field>
-        <field name="model">olap.cube</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap cube">
-                <field name="name"/>
-                <field name="table_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_cube_form">
-        <field name="name">olap.cube.form</field>
-        <field name="model">olap.cube</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap cube">
-                <field name="name" select="1" colspan="4"/>
-                <field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}"/>
-                <field name="query_log" select="2"/>
-                <field name="table_id"  colspan="4" context="{'parent_schema_id':schema_id}"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_cube_form">
-        <field name="name">Olap Cubes</field>
-        <field name="res_model">olap.cube</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Cubes"
-        parent ="menu_bi_conf_cubes"
-        action="action_olap_cube_form"
-        id="menu_action_olap_cube_form"/>
-
-
-    # ------------------------------------------------------------------
-    # Olap Dimensions
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_dimension_tree">
-        <field name="name">olap.dimension.tree</field>
-        <field name="model">olap.dimension</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap dimension">
-                <field name="name"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_dimension_form">
-        <field name="name">olap.dimension.form</field>
-        <field name="model">olap.dimension</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap dimension">
-                <field name="name" select="1"/>
-                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_dimension_form">
-        <field name="name">Olap Dimensions</field>
-        <field name="res_model">olap.dimension</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Dimension"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_dimension_form"
-        id="menu_action_olap_dimension_form"/>
-
-    # ------------------------------------------------------------------
-    # Olap Hierarchies
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_hierarchy_tree">
-        <field name="name">olap.hierarchy.tree</field>
-        <field name="model">olap.hierarchy</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap hierarchy">
-                <field name="name"/>
-                <field name="dimension_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_hierarchy_form">
-        <field name="name">olap.hierarchy.form</field>
-        <field name="model">olap.hierarchy</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap hierarchy">
-                <field name="name" select="1" colspan="4"/>
-                <field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}"/>
-<!--                <field name="field_name" select="2"/>-->
-                <field name="sequence"/>
-                <field name="table_id" select="2" colspan="4" context="{'d_id':dimension_id}"/>
-<!--                <separator string="Levels" colspan="4"/>
-                <field name="level_ids" colspan="4" nolabel="1"/>-->
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_hierarchy_form">
-        <field name="name">Olap Hierarchies</field>
-        <field name="res_model">olap.hierarchy</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Hierarchy"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_hierarchy_form"
-        id="menu_action_olap_hierarchy_form"/>
-
-
-    # ------------------------------------------------------------------
-    # Olap Levels
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_level_tree">
-        <field name="name">olap.level.tree</field>
-        <field name="model">olap.level</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Level">
-                <field name="name"/>
-                <field name="column_name"/>
-                <field name="column_id_name" invisible="True"/>
-                <field name="type"/>
-                <field name="table_name" invisible="True"/>
-                <field name="sequence"/>
-                <field name="hierarchy_id"/>
-
-
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_level_form">
-        <field name="name">olap.level.form</field>
-        <field name="model">olap.level</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap level">
-                <field name="name" select="1" colspan="4"/>
-                <field name="column_name" select="1"
-                	on_change="onchange_column_name(column_name)"
-                	context="{'filter_cols_hier':hierarchy_id}" />
-                <field name="column_id_name" select="1"/>
-                <field name="type" select="1"/>
-                <field name="table_name" select="1"/>
-                <field name="sequence"/>
-                <field name="hierarchy_id" select="1" attrs="{'readonly':[('hierarchy_id','!=','')]}"/>
-            </form>
-       </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_level_form">
-        <field name="name">Olap Level</field>
-        <field name="res_model">olap.level</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Level"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_level_form"
-        id="menu_action_olap_level_form"/>
-
-
-    # ------------------------------------------------------------------
-    # Olap Measure
-    # ------------------------------------------------------------------
-
-    <record model="ir.ui.view" id="view_olap_measure_tree">
-        <field name="name">olap.measure.tree</field>
-        <field name="model">olap.measure</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap measure">
-                <field name="name"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_measure_form">
-        <field name="name">olap.measure.form</field>
-        <field name="model">olap.measure</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap measure">
-                <field name="name" select="1"/>
-                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
-                <field name="value_column_id_name" invisible="True"/>
-                <field name="table_name" invisible="True"/>
-                <field name="measure_type"/>
-                <group colspan="4" attrs="{'invisible':[('measure_type','!=','fact_column')]}">
-                    <newline/>
-                    <field name="value_column" select="1" attrs="{'required':[('measure_type','=','fact_column')]}" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
-                    <field name="agregator" select="2"/>
-                    <field name="formatstring" select="2"/>
-                </group>
-                <group colspan="4"  attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
-                    <newline/>
-                    <field name="value_sql" colspan="4" select="2"
-                    	attrs="{'required':[('measure_type','=','sql_expr')]}" />
-                    <field name="datatype" select="2"/>
-                </group>
-            </form>
-
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_measure_form">
-        <field name="name">Olap Measures</field>
-        <field name="res_model">olap.measure</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem
-        name="Olap Measures"
-        parent = "menu_bi_conf_cubes"
-        action="action_olap_measure_form"
-        id="menu_action_olap_measure_form"/>
-
-    # ------------------------------------------------------------------
-    # Olap Saved Query
-    # ------------------------------------------------------------------
-    <record model="ir.ui.view" id="view_olap_saved_query_form_tree">
-        <field name="name">olap.saved.query.tree</field>
-        <field name="model">olap.saved.query</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Saved Query">
-            	<field name="name"/>
-                <field name="cube_id"/>
-                <field name="mdx_id"/>
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="time"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_olap_saved_query_form_mdx">
-        <field name="name">olap.saved.query.mdx</field>
-        <field name="model">olap.saved.query</field>
-        <field name="type">mdx</field>
-        <field name="arch" type="xml">
-            <tree string="Olap Saved Query">
-            	<field name="name"/>
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-                <field name="mdx_id"/>
-                <field name="axis_keys" readonly="True"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_saved_query_form">
-        <field name="name">olap.saved.query.form</field>
-        <field name="model">olap.saved.query</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Olap Saved Query">
-             	<field name="name" select="1" readonly="True"/>
-                <field name="query" select="1" colspan="4" readonly="True"/>
-                <field name="user_id" readonly="True"/>
-                <field name="cube_id" select="2" readonly="True"/>
-                <field name="mdx_id" select="2" readonly="True"/>
-                <field name="schema_id" select="2" readonly="True"/>
-                <field name="axis_keys" readonly="True"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_saved_query_form">
-        <field name="name">Olap Saved Query</field>
-        <field name="res_model">olap.saved.query</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form,mdx</field>
-    </record>
-    <menuitem
-        name="Olap Saved Query"
-        parent = "menu_bi_conf_tools"
-        action="action_olap_saved_query_form"
-        id="menu_action_olap_saved_query_form"/>
-
-<!-- All Logs -->
-
-    <record model="ir.ui.view" id="view_olap_query_logs_tree">
-        <field name="name">olap.query.logs</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="All Logs">
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-                <field name="schema_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_query_logs_form">
-        <field name="name">olap.query.logs.form</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="All Logs">
-                <field name="query" colspan="4" select="1" readonly="True"/>
-                <field name="time" select="2" readonly="True"/>
-                <field name="result_size" select="2" readonly="True"/>
-                <field name="cube_id" select="2" readonly="True"/>
-                <field name="count" readonly="True"/>
-                <field name="schema_id" readonly="True"/>
-            </form>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_olap_query_logs_form">
-        <field name="name">All Logs</field>
-        <field name="res_model">olap.query.logs</field>
-        <field name="view_type">form</field>
-    </record>
-
-    <menuitem
-        name="All Logs"
-        action="action_olap_query_logs_form"
-        id="menu_action_olap_query_logs_form"
-        parent="menu_bi_conf_tools"/>
-
-<!-- All Logs / My logs -->
-
-    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
-        <field name="name">olap.query.logs</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="My Logs">
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
-        <field name="name">olap.query.logs</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">mdx</field>
-        <field name="arch" type="xml">
-            <tree string="My Logs">
-                <field name="user_id"/>
-                <field name="query"/>
-                <field name="cube_id"/>
-            </tree>
-        </field>
-    </record>
-
-<!-- Query Logs  -->
-
-    <record model="ir.ui.view" id="view_olap_query_logs_my_form">
-        <field name="name">olap.query.logs.form</field>
-        <field name="model">olap.query.logs</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="My Logs">
-                <field name="user_id" select="1" readonly="True"/>
-                <field name="query" select="1" readonly="True"/>
-                <field name="time" select="2" readonly="True"/>
-                <field name="result_size" select="2" readonly="True"/>
-                <field name="cube_id" select="2" readonly="True"/>
-
-            </form>
-        </field>
-
-    </record>
-
-    <record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
-        <field name="name">My Logs</field>
-        <field name="res_model">olap.query.logs</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form,mdx</field>
-        <field name="domain">[('user_id','=',uid)]</field>
-    </record>
-
-    <menuitem
-        name="My Logs"
-        action="action_olap_query_logs_my_form"
-        id="menu_action_olap_query_logs_my_form"
-        parent="menu_action_olap_query_logs_form"/>
-
-</data>
+	<!-- Wizard view for the load data -->
+	
+	        <record id="bi_load_db_form" model="ir.ui.view">
+	            <field name="name">bi.load.db.form</field>
+	            <field name="model">bi.load.db.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Load Database Tables">
+	                    <label align="0.0" string="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." colspan="4" />
+	                    <newline/>
+	                    <label align="0.0" string="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:" colspan="4"/>
+	                    <newline/>
+	                    <field name="fact_table" />
+	                    <field name="db_name" />
+	                    <newline/>
+	                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
+	                    <button name="action_load" string="Load Data Structure" type="object"  colspan="2"/>
+	                </form>
+	            </field>
+	        </record>
+	        
+	        <record id="act_bi_load_db_wizard" model="ir.actions.act_window">
+	            <field name="name">Load database Structure</field>
+	            <field name="res_model">bi.load.db.wizard</field>
+	            <field name="src_model">olap.schema</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="auto_refresh" eval="1"/>
+	            <field name="target">new</field>
+	        </record>
+	
+	
+	<!-- Wizard For Olap Warehouse -->
+	
+	        <record id="view_warehouse_bi" model="ir.ui.view">
+	            <field name="name">Olap Warehouse</field>
+	            <field name="model">olap.warehouse.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Warehouse">
+	                    <group colspan="16">
+	                    <separator string="Query" colspan="16"/>
+	                    <field name="query" nolabel="1" colspan="16"/>
+	                    <button string="Ok" name="action_ok" colspan="16" type="object" icon='gtk-ok'/>
+	                    </group>
+	                </form>
+	            </field>
+	        </record>
+	        
+	        <record id="action_olap_warehouse" model="ir.actions.act_window">
+	            <field name="name">Olap Warehouse</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">olap.warehouse.wizard</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+	        
+	        <menuitem
+	        name="Olap Warehouse"
+	        action="action_olap_warehouse"
+	        id="menu_bi_warehouse"
+	        sequence="51"
+	        parent="base.next_id_50"
+	        />
+	
+	<!-- Wizard View for the parameters wizard -->
+	
+	        <record id="view_config_bi" model="ir.ui.view">
+	            <field name="name">Parameters Configuration</field>
+	            <field name="model">olap.parameters.config.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Parameters Configure">
+	                    <separator string="BI Web Client." colspan="4"/>
+	                    <label string="This wizard will automatically configure the web client for BI." align="0.0" colspan="4"/>
+	                    <field name="host_name" colspan="4"/>
+	                    <field name="host_port" colspan="4"/>
+	                    <separator string="" colspan="4"/>
+	                    <label string="" colspan="2"/>
+	                    <group col="4" colspan="2">
+	                        <button special="cancel" string="Cancel" name="action_cancel" type="object" icon='gtk-cancel'/>
+	                        <button name="action_config" string="Configure" icon='gtk-ok' type="object"/>
+	                    </group>
+	                </form>
+	            </field>
+	        </record>
+	
+	        <record id="action_config_bi_parameters" model="ir.actions.act_window">
+	            <field name="name">Parameters Configuration</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">olap.parameters.config.wizard</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+	        
+	        <menuitem
+	        name="Server Parameters"
+	        action="action_config_bi_parameters"
+	        id="menu_bi_server_parameters"
+	        sequence="50"
+	        parent="base.next_id_50"
+	        />
+	        
+	        <record model="ir.actions.todo" id="config_auto_directory">
+	            <field name="name">Server Parameters Configuration</field>
+	            <field name="note">This wizard will configure the URL of the web client</field>
+	            <field name="action_id" ref="action_config_bi_parameters"/>
+	        </record>
+	
+	
+	<!-- Wizard view for the Auto Configuring the data -->
+	
+	        <record id="bi_auto_configure_form" model="ir.ui.view">
+	            <field name="name">bi.auto.configure.form</field>
+	            <field name="model">bi.auto.configure.wizard</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Auto Congifuring Tables">
+	                    <label align="0.0" string="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." colspan="4" />
+	                    <field name="name" select="1" colspan="4"/>
+	                    <newline/>
+	                    <button name="action_cancel" string="Cancel" type="object" colspan="2"/>
+	                    <button name="action_load" string="Auto Configure Structure" type="object"  colspan="2"/>
+	                </form>
+	            </field>
+	        </record>
+	        
+	        <record id="act_bi_auto_configure" model="ir.actions.act_window">
+	            <field name="name">Auto Configuration</field>
+	            <field name="res_model">bi.auto.configure.wizard</field>
+	            <field name="src_model">olap.schema</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="auto_refresh" eval="1"/>
+	            <field name="target">new</field>
+	        </record>
+	
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Schema
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_schema_tree">
+	        <field name="name">olap.schema.tree</field>
+	        <field name="model">olap.schema</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Schema">
+	                <field name="name"/>
+	                <field name="database_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	
+	    <record model="ir.ui.view" id="view_olap_schema_form">
+	        <field name="name">olap.schema.form</field>
+	        <field name="model">olap.schema</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap Schema">
+	              <field name="name" select="1" colspan="4"/>
+	              <field name="database_id" select="2" colspan="4"/>
+	              <field name="loaded" colspan="3"/>
+	              <button name="%(act_bi_load_db_wizard)d" string="Reload Structure" type="action" states="done"/>
+	              <field name="configure" colspan="3"/>
+	              <button name="%(bi_load_configuration_table)d"
+	              	string="ReConfigure Structure" type="action"
+	              	states="done" />
+	              <field name="ready" select="2" colspan="3"/>
+	              <separator string="Schema description" colspan="4"/>
+	              <field name="note" colspan="4" nolabel="1"/>
+	              <field name="state" select="2" colspan="2" />
+	              <group colspan="2">
+	                <button string="Connect to Database" name="dbconnect" states="none"/>
+	                <button string="Load Database Structure"
+	                	name="%(act_bi_load_db_wizard)d" type="action"
+	                	states="dbconnect" target="new" />
+	                <button string="Configure Manually" name="dbconfigure"  states="dbload"/>
+	                <button string="Mark as Configured" name="dbready" states="dbconfigure"/>
+	              </group>
+	              <separator string="Auto Application Configuration" colspan="4"/>
+	              <field name="app_detect" nolabel="1" colspan="3"/>
+	              <button string="Configure Automatically "
+	              	name="%(act_bi_auto_configure)d" type="action"
+	              	states="dbload" target="new" />
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_schema_form">
+	        <field name="name">Olap Schemas</field>
+	        <field name="res_model">olap.schema</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Schema"
+	        action="action_olap_schema_form"
+	        id="menu_action_olap_schema_form"
+	        parent="menu_bi_conf_cubes"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Cubes Table
+	    # ------------------------------------------------------------------
+	    <record model="ir.ui.view" id="view_olap_cube_table_form">
+	        <field name="name">olap.cube.table.form</field>
+	        <field name="model">olap.cube.table</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap cube_table" >
+	                <field name="name" select="2"/>
+	                <field name="column_link_id" context="{'fk':True,'dim_x':context.get('d_id',False)}"/>
+	                <newline/>
+	                <separator colspan="2" string="Joined Tables"/>
+	                <field invisible="True" name="line_ids" nolabel="1">
+	                    <form string="Database Tables">
+	                        <field name="table_id"/>
+	                        <field name="field_id"/>
+	                    </form>
+	                    <tree string="Database Tables">
+	                        <field name="table_id"/>
+	                        <field name="field_id"/>
+	                    </tree>
+	                </field>
+	                <field name="available_table_ids" colspan="4"
+	                	nolabel="1" readonly="0"
+	                	domain="[('available_table_ids','in',available_table_ids)]"
+	                	context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
+	                	<tree string="Database Tables">
+	                		<field name="related_to" string="Joined Table" />
+	                		<field name="name" />
+	                		<field name="table_id" />
+	                		<field name="primary_key" />
+	                	</tree>
+	                </field>
+	            </form>
+	        </field>
+	    </record>
+	
+	    <record model="ir.actions.act_window" id="action_olap_cube_table_form">
+	        <field name="name">Olap Cube Tables</field>
+	        <field name="res_model">olap.cube.table</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Cubes Table"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_cube_table_form"
+	        id="menu_action_olap_cube_table_form"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Cubes
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_cube_tree">
+	        <field name="name">olap.cube.tree</field>
+	        <field name="model">olap.cube</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap cube">
+	                <field name="name"/>
+	                <field name="table_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_cube_form">
+	        <field name="name">olap.cube.form</field>
+	        <field name="model">olap.cube</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap cube">
+	                <field name="name" select="1" colspan="2"/>
+	                <field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}" colspan="2"/>
+	                <field name="table_id"   context="{'parent_schema_id':schema_id}" colspan="2"/>
+	                <field name="query_log" select="2" colspan="2"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_cube_form">
+	        <field name="name">Olap Cubes</field>
+	        <field name="res_model">olap.cube</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Cubes"
+	        parent ="menu_bi_conf_cubes"
+	        action="action_olap_cube_form"
+	        id="menu_action_olap_cube_form"/>
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Dimensions
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_dimension_tree">
+	        <field name="name">olap.dimension.tree</field>
+	        <field name="model">olap.dimension</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap dimension">
+	                <field name="name"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_dimension_form">
+	        <field name="name">olap.dimension.form</field>
+	        <field name="model">olap.dimension</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap dimension">
+	                <field name="name" select="1"/>
+	                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_dimension_form">
+	        <field name="name">Olap Dimensions</field>
+	        <field name="res_model">olap.dimension</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Dimension"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_dimension_form"
+	        id="menu_action_olap_dimension_form"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Hierarchies
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_hierarchy_tree">
+	        <field name="name">olap.hierarchy.tree</field>
+	        <field name="model">olap.hierarchy</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap hierarchy">
+	                <field name="name"/>
+	                <field name="dimension_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_hierarchy_form">
+	        <field name="name">olap.hierarchy.form</field>
+	        <field name="model">olap.hierarchy</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap hierarchy">
+	                <field name="name" select="1" colspan="2"/>
+	                <field name="sequence" colspan="2"/>
+	                <field name="dimension_id" select="1" attrs="{'readonly':[('dimension_id','!=','')]}" colspan="4"/>
+	<!--                <field name="field_name" select="2"/>-->
+	                
+	                <field name="table_id" select="2" colspan="4" context="{'d_id':dimension_id}"/>
+	<!--                <separator string="Levels" colspan="4"/>
+	                <field name="level_ids" colspan="4" nolabel="1"/>-->
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_hierarchy_form">
+	        <field name="name">Olap Hierarchies</field>
+	        <field name="res_model">olap.hierarchy</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Hierarchy"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_hierarchy_form"
+	        id="menu_action_olap_hierarchy_form"/>
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Levels
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_level_tree">
+	        <field name="name">olap.level.tree</field>
+	        <field name="model">olap.level</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Level">
+	                <field name="name"/>
+	                <field name="column_name"/>
+	                <field name="column_id_name" invisible="True"/>
+	                <field name="type"/>
+	                <field name="table_name" invisible="True"/>
+	                <field name="sequence"/>
+	                <field name="hierarchy_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_level_form">
+	        <field name="name">olap.level.form</field>
+	        <field name="model">olap.level</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap level">
+	                <field name="name" select="1" colspan="4"/>
+	                <field name="column_name" select="1"
+	                	on_change="onchange_column_name(column_name)"
+	                	context="{'filter_cols_hier':hierarchy_id}" />
+	                <field name="column_id_name" select="1"/>
+	                <field name="type" select="1"/>
+	                <field name="table_name" select="1"/>
+	                <field name="sequence"/>
+	                <field name="hierarchy_id" select="1" attrs="{'readonly':[('hierarchy_id','!=','')]}"/>
+	            </form>
+	       </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_level_form">
+	        <field name="name">Olap Level</field>
+	        <field name="res_model">olap.level</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Level"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_level_form"
+	        id="menu_action_olap_level_form"/>
+	
+	
+	    # ------------------------------------------------------------------
+	    # Olap Measure
+	    # ------------------------------------------------------------------
+	
+	    <record model="ir.ui.view" id="view_olap_measure_tree">
+	        <field name="name">olap.measure.tree</field>
+	        <field name="model">olap.measure</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap measure">
+	                <field name="name"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_measure_form">
+	        <field name="name">olap.measure.form</field>
+	        <field name="model">olap.measure</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap measure">
+	                <field name="name" select="1"/>
+	                <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
+	                <field name="value_column_id_name" invisible="True"/>
+	                <field name="table_name" invisible="True"/>
+	                <field name="measure_type"/>
+	                <group colspan="4" attrs="{'invisible':[('measure_type','!=','fact_column')]}">
+	                    <newline/>
+	                    <field name="value_column" select="1" attrs="{'required':[('measure_type','=','fact_column')]}" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
+	                    <field name="agregator" select="2" />
+	                    <field name="formatstring" select="2"/>
+	                </group>
+	                <group colspan="4"  attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
+	                    <newline/>
+	                    <separator string="SQL Expression" colspan="4"/>
+	                    <field name="value_sql" colspan="4" select="2"
+	                    	attrs="{'required':[('measure_type','=','sql_expr')]}" nolabel="1" />
+	                    <field name="datatype" select="2"/>
+	                </group>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_measure_form">
+	        <field name="name">Olap Measures</field>
+	        <field name="res_model">olap.measure</field>
+	        <field name="view_type">form</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Measures"
+	        parent = "menu_bi_conf_cubes"
+	        action="action_olap_measure_form"
+	        id="menu_action_olap_measure_form"/>
+	
+	    # ------------------------------------------------------------------
+	    # Olap Saved Query
+	    # ------------------------------------------------------------------
+	    <record model="ir.ui.view" id="view_olap_saved_query_form_tree">
+	        <field name="name">olap.saved.query.tree</field>
+	        <field name="model">olap.saved.query</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Saved Query">
+	            	<field name="name"/>
+	                <field name="cube_id"/>
+	                <field name="mdx_id"/>
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="time"/>
+	            </tree>
+	        </field>
+	    </record>
+	
+	    <record model="ir.ui.view" id="view_olap_saved_query_form_mdx">
+	        <field name="name">olap.saved.query.mdx</field>
+	        <field name="model">olap.saved.query</field>
+	        <field name="type">mdx</field>
+	        <field name="arch" type="xml">
+	            <tree string="Olap Saved Query">
+	            	<field name="name"/>
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	                <field name="mdx_id"/>
+	                <field name="axis_keys" readonly="True"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_saved_query_form">
+	        <field name="name">olap.saved.query.form</field>
+	        <field name="model">olap.saved.query</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="Olap Saved Query">
+	            	<group colspan="4">
+		            	<field name="user_id" readonly="True"/>
+		                <field name="cube_id" select="2" readonly="True"/>
+		                <field name="mdx_id" select="2" readonly="True"/>
+		                <field name="schema_id" select="2" readonly="True"/>
+	                </group>
+		                <separator string="Query Name" colspan="4"/>
+		             	<field name="name" select="1" readonly="True" nolabel="1"/>
+		             	<separator string="Query" colspan="4"/>
+		                <field name="query" select="1" colspan="4" readonly="True" nolabel="1"/>
+		                <separator string="Axis Keys" colspan="4"/>
+		                <field name="axis_keys" readonly="True" nolabel="1"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_saved_query_form">
+	        <field name="name">Olap Saved Query</field>
+	        <field name="res_model">olap.saved.query</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form,mdx</field>
+	    </record>
+	    
+	    <menuitem
+	        name="Olap Saved Query"
+	        parent = "menu_bi_conf_tools"
+	        action="action_olap_saved_query_form"
+	        id="menu_action_olap_saved_query_form"/>
+	
+	<!-- All Logs -->
+	
+	    <record model="ir.ui.view" id="view_olap_query_logs_tree">
+	        <field name="name">olap.query.logs</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="All Logs">
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	                <field name="schema_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_query_logs_form">
+	        <field name="name">olap.query.logs.form</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="All Logs">
+	            	<field name="cube_id" select="2" readonly="True" colspan="2"/>
+	            	<field name="schema_id" readonly="True" colspan="2"/>
+	            	<field name="time" select="2" readonly="True" colspan="4"/>
+	            	<field name="result_size" select="2" readonly="True" colspan="2"/>
+	            	<field name="count" readonly="True" colspan="2"/>
+	            	<separator string="Query" colspan="4"/>
+	                <field name="query" colspan="4" select="1" readonly="True" nolabel="1"/>
+	            </form>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.actions.act_window" id="action_olap_query_logs_form">
+	        <field name="name">All Logs</field>
+	        <field name="res_model">olap.query.logs</field>
+	        <field name="view_type">form</field>
+	    </record>
+	
+	    <menuitem
+	        name="All Logs"
+	        action="action_olap_query_logs_form"
+	        id="menu_action_olap_query_logs_form"
+	        parent="menu_bi_conf_tools"/>
+	
+	<!-- All Logs / My logs -->
+	
+	    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
+	        <field name="name">olap.query.logs</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="My Logs">
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	    
+	    <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
+	        <field name="name">olap.query.logs</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">mdx</field>
+	        <field name="arch" type="xml">
+	            <tree string="My Logs">
+	                <field name="user_id"/>
+	                <field name="query"/>
+	                <field name="cube_id"/>
+	            </tree>
+	        </field>
+	    </record>
+	
+	<!-- Query Logs  -->
+	
+	    <record model="ir.ui.view" id="view_olap_query_logs_my_form">
+	        <field name="name">olap.query.logs.form</field>
+	        <field name="model">olap.query.logs</field>
+	        <field name="type">form</field>
+	        <field name="arch" type="xml">
+	            <form string="My Logs">
+	                <field name="user_id" select="1" readonly="True"/>
+	                <separator string="Query" colspan="4"/>
+	                <field name="query" colspan="4" select="1" readonly="True" nolabel="1"/>
+	                <field name="time" select="2" readonly="True"/>
+	                <field name="result_size" select="2" readonly="True"/>
+	                <field name="cube_id" select="2" readonly="True"/>
+	            </form>
+	        </field>
+	    </record>
+	
+	    <record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
+	        <field name="name">My Logs</field>
+	        <field name="res_model">olap.query.logs</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form,mdx</field>
+	        <field name="domain">[('user_id','=',uid)]</field>
+	    </record>
+	
+	    <menuitem
+	        name="My Logs"
+	        action="action_olap_query_logs_my_form"
+	        id="menu_action_olap_query_logs_my_form"
+	        parent="menu_action_olap_query_logs_form"/>
+	
+	</data>
 </openerp>
diff --git a/addons/olap/data/olap_fact_view.xml b/addons/olap/data/olap_fact_view.xml
index 74a794d9eee..0dc543ace1e 100755
--- a/addons/olap/data/olap_fact_view.xml
+++ b/addons/olap/data/olap_fact_view.xml
@@ -230,10 +230,11 @@
         <field name="arch" type="xml">
             <form string="Olap Application">
                 <newline/>
-                <field name="name" select="1" colspan="2"/>
-                <field name="query" select="1" colspan="2"/>
-                <field name="table_ids" select="1" colspan="4" nolabel="1"/>
-                <field name="field_ids" select="1" colspan="4" nolabel="1" rowspan="1"/>
+                	<field name="name" select="1" colspan="2"/>
+                	<separator colspan="4" string="Application query"/>
+                	<field name="query" select="1" colspan="4" nolabel="1"/>
+                	<field name="table_ids" select="1" colspan="4" nolabel="1"/>
+                	<field name="field_ids" select="1" colspan="4" nolabel="1" rowspan="1"/>
             </form>
         </field>
     </record>
@@ -274,8 +275,9 @@
                 <newline/>
                 <field name="name" select="1" colspan="2"/>
                 <field name="table_name" select="1" />
-                <field name="is_hidden" select="1" colspan="2" />
                 <field name="application_id" select="1" />
+                <field name="is_hidden" select="1" colspan="2" />
+                
             </form>
         </field>
     </record>
@@ -320,9 +322,10 @@
                 <field name="name" select="1" colspan="2"/>
                 <field name="field_name" select="1" />
                 <field name="table_name" select="1" />
+                <field name="application_id" select="1" />
                 <newline/>
                 <field name="is_hidden" select="1" colspan="2"/>
-                <field name="application_id" select="1" />
+                
             </form>
         </field>
     </record>
diff --git a/addons/olap/i18n/de.po b/addons/olap/i18n/de.po
index a4ab30d7ca8..e4013cbb47e 100644
--- a/addons/olap/i18n/de.po
+++ b/addons/olap/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/olap/i18n/es.po b/addons/olap/i18n/es.po
index 5469d60e8c1..13fb70934e9 100644
--- a/addons/olap/i18n/es.po
+++ b/addons/olap/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-13 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/olap/i18n/hr.po b/addons/olap/i18n/hr.po
index 2cf98aff878..3d6e8d27f81 100644
--- a/addons/olap/i18n/hr.po
+++ b/addons/olap/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/olap/i18n/it.po b/addons/olap/i18n/it.po
index 0e1571e5dbd..cf0e58a5b67 100644
--- a/addons/olap/i18n/it.po
+++ b/addons/olap/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/olap/i18n/oc.po b/addons/olap/i18n/oc.po
index 1e48d0771f8..3ea68b79571 100644
--- a/addons/olap/i18n/oc.po
+++ b/addons/olap/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/olap/i18n/pl.po b/addons/olap/i18n/pl.po
index 3a111ebdcf7..c6d6406622e 100644
--- a/addons/olap/i18n/pl.po
+++ b/addons/olap/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/olap/i18n/sl.po b/addons/olap/i18n/sl.po
index a4a42b9e467..90f1a112db3 100644
--- a/addons/olap/i18n/sl.po
+++ b/addons/olap/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/olap/i18n/sv.po b/addons/olap/i18n/sv.po
index a12c2dd119a..52661e3fd2e 100644
--- a/addons/olap/i18n/sv.po
+++ b/addons/olap/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap
diff --git a/addons/olap/olap.py b/addons/olap/olap.py
index 5081619ce71..338d61f81fa 100644
--- a/addons/olap/olap.py
+++ b/addons/olap/olap.py
@@ -40,15 +40,17 @@ class olap_fact_database(osv.osv):
     _description = "Olap Fact Database"
 
     def _connection_get(self, cr, uid, ids, field_name, arg, context = {}):
-        """
-            Return a connection string url needed by SQL Alchemy. Exemple:
+        """  Return a connection string url needed by SQL Alchemy. Exemple:
             'postgres://scott:tiger@localhost:5432/mydatabase'
+
+             @param self: The object pointer
              @param cr: the current row, from the database cursor,
              @param uid: the current user’s ID for security checks,
              @param ids: List of connection’s IDs
+             @param arg: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
              @param context: A standard dictionary for contextual values
-
         """
+
         res = {}
         for obj in self.browse(cr, uid, ids, context):
             res[obj.id] = '%s://%s:%s@%s:%d/%s' % (obj.type, obj.db_login, \
@@ -56,14 +58,13 @@ class olap_fact_database(osv.osv):
         return res
 
     def test_connection(self, cr, uid, ids, context = {}):
-
         """ Test connection for postgres Or ,MySql Or ,Oracle
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Test Connection’s IDs
-        @param context: A standard dictionary for contextual values
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Test Connection’s IDs
+            @param context: A standard dictionary for contextual values
         """
-
         try:
             self_obj = self.browse(cr, uid, ids, context)
             for obj in self_obj:
@@ -140,16 +141,16 @@ class olap_schema(osv.osv ):
     _description = "Olap Schema"
 
     def _app_detect(self, cr, uid, ids, field_name, arg, context = {}):
-
         """
             Return a Application type
+            @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Detected Application’s IDs
             @param context: A standard dictionary for contextual values
         """
-        res = {}
 
+        res = {}
         app_objs = self.pool.get('olap.application')
         app_ids = app_objs.search(cr, uid, [])
         app_res = app_objs.browse(cr, uid, app_ids)
@@ -202,13 +203,13 @@ class olap_schema(osv.osv ):
         }
 
     def action_dbconnect(self, cr, uid, ids, context = {}):
-
-        """ Connect DB with postgres ,Or MySql , Or  Orcale
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Database Connection action’s IDs
-        @param context: A standard dictionary for contextual values
-    """
+        """ Connect DB with postgres ,Or MySql,Or Orcale
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Database Connection action’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         schema = self.browse(cr, uid, ids, context)[0]
         type = schema.database_id.type
@@ -255,12 +256,12 @@ class olap_schema(osv.osv ):
         return True
 
     def action_dbload(self, cr, uid, ids, context = {}):
-
-        """ Load DB
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of Database Load Action’s IDs
-         @param context: A standard dictionary for contextual values
+        """  Load DB
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Database Load Action’s IDs
+             @param context: A standard dictionary for contextual values
         """
 
         for id in ids:
@@ -271,12 +272,12 @@ class olap_schema(osv.osv ):
 
 
     def action_dbconfigure(self, cr, uid, ids, context = {}):
-
-        """ Configure with Database
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of Database Configuraion Action’s IDs
-         @param context: A standard dictionary for contextual values
+        """  Configure with Database
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Database Configuraion Action’s IDs
+             @param context: A standard dictionary for contextual values
         """
 
         for id in ids:
@@ -288,11 +289,12 @@ class olap_schema(osv.osv ):
         return True
 
     def action_dbready(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-        @param ids: List of Database Action’s IDs
-        @param context: A standard dictionary for contextual values """
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Database Action’s IDs
+            @param context: A standard dictionary for contextual values """
 
         for id in ids:
             self.write(cr, uid, id, {'ready': True})
@@ -300,11 +302,12 @@ class olap_schema(osv.osv ):
         return True
 
     def action_done(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-        @param ids: List of Action’s IDs
-        @param context: A standard dictionary for contextual values """
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Action’s IDs
+            @param context: A standard dictionary for contextual values """
 
         for id in ids:
             self.write(cr, uid, id, {'state': 'done'})
@@ -343,12 +346,12 @@ class olap_schema(osv.osv ):
         raise 'Not implemented !'
 
     def request(self, cr, uid, name, request, context = {}):
-
         """
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Request’s IDs
-        @param context: A standard dictionary for contextual values
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Request’s IDs
+            @param context: A standard dictionary for contextual values
         """
 
         ids = self.search(cr, uid, [('name', '=', name)])
@@ -387,7 +390,7 @@ olap_schema()
 
 
 class olap_database_tables(osv.osv):
-    """ Database Tables """
+    """Database Tables"""
 
     _name = "olap.database.tables"
     _description = "Olap Database Tables"
@@ -408,15 +411,15 @@ class olap_database_tables(osv.osv):
     }
 
     def name_get(self, cr, uid, ids, context = {}):
-
         """ Get Database Name
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Name’s IDs
-        @param context: A standard dictionary for contextual values """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Name’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         result = []
-
         for t in self.browse(cr, uid, ids, context):
 
             if t.name <> t.table_db_name:
@@ -427,10 +430,12 @@ class olap_database_tables(osv.osv):
 
     def show_col_view(self, cr, uid, ids, context = {}):
         """ Open Tree View of Database Columns
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of Column’s IDs
-         @param context: A standard dictionary for contextual values """
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Column’s IDs
+             @param context: A standard dictionary for contextual values
+        """
 
         ids_cols = self.pool.get('olap.database.columns').search(cr, uid, ([('table_id', '=', ids[0])]))
         id = self.pool.get('ir.ui.view').search(cr, uid, \
@@ -448,16 +453,30 @@ class olap_database_tables(osv.osv):
 
     def hide_col(self, cr, uid, ids, context = {}):
         # To hide all the related columns also
+        """ Hide all the related columns
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Hide Column’s IDs
+             @param context: A standard dictionary for contextual values
+        """
+
         for id in ids:
-            self.write(cr, uid, id, {'hide':True})
+            self.write(cr, uid, id, {'hide': True})
         return {}
 
     def show_col(self, cr, uid, ids, context = {}):
         # To show or unhide all the columns also
-        for id in ids:
-            self.write(cr, uid, id, {'hide':False})
-        return {}
+        """ show all the related columns
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Column’s IDs
+             @param context: A standard dictionary for contextual values """
 
+        for id in ids:
+            self.write(cr, uid, id, {'hide': False})
+        return {}
 
 olap_database_tables()
 
@@ -476,20 +495,22 @@ class olap_database_columns(osv.osv):
         'float8': 'Double Precesion',
         'varchar': 'Character Varying',
         'bool': 'Boolean',
-        'bytea':'Byte A',
-        'int2':'Small Integer',
-        'int4':'Integer',
-        'int8':'Big Integer',
-        'text':'Text',
-        'date':'Date',
+        'bytea': 'Byte A',
+        'int2': 'Small Integer',
+        'int4': 'Integer',
+        'int8': 'Big Integer',
+        'text': 'Text',
+        'date': 'Date',
         'time': 'TimeStamp without Time Zone',
-    'number':'NUMBER',
+    'number': 'NUMBER',
     }
 
     def _datatypes_get(self, *args, **argv):
-
-        """ @param *args: For Positional Argument
-            @param **args: For Keyword Argument """
+        """
+            @param self: The object pointer
+            @param *args: For Positional Argument
+            @param **args: For Keyword Argument
+        """
 
         return self.datatypes.items()
 
@@ -512,15 +533,15 @@ class olap_database_columns(osv.osv):
     }
 
     def name_get(self, cr, uid, ids, context = {}):
-
         """ Get Database Column
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of Name’s IDs
-         @param context: A standard dictionary for contextual values """
+             @param self: The object pointer
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of Name’s IDs
+             @param context: A standard dictionary for contextual values
+        """
 
         result = []
-
         for t in self.browse(cr, uid, ids, context):
 
             if t.name <> t.column_db_name:
@@ -532,6 +553,15 @@ class olap_database_columns(osv.osv):
 
     def search(self, cr, uid, args, offset = 0, limit = None, order = None,
             context = None, count = False):
+        """ olap search method.
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user’s ID for security checks,
+            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+            @param offset: The Number of Results to Pass
+            @param limit: The Number of Results to Return
+            @param context: A standard dictionary for contextual values
+        """
 
         if not context:
             return super(olap_database_columns, self).search(cr, uid, args, offset, limit,
@@ -594,7 +624,7 @@ class olap_database_columns(osv.osv):
             for lines in cube_obj.table_id.line_ids:
                 make_ids.append(lines.table_id.id)
 
-            if make_ids:
+            if make_ids and cube_obj.table_id.line_ids:
                 make_ids.append(cube_obj.table_id.line_ids[len(cube_obj.table_id.line_ids) - 1].field_id.related_to.id)
                 args = [('table_id', 'in', make_ids), ('related_to', '=', False), \
                     ('primary_key', '<>', True), \
@@ -647,33 +677,39 @@ class olap_database_columns(osv.osv):
 
 
     def hide_col(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ Hide all the related columns
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Hide Column’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         for id in ids:
             self.write(cr, uid, id, {'hide':True})
         return {}
 
     def show_col(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ show all the related columns
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of column’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         for id in ids:
             self.write(cr, uid, id, {'hide': True})
         return {}
 
     def field_add(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ Add all the Related Field
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Field’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         col_data = self.pool.get('olap.database.columns').read(cr, uid, ids, [], context)[0]
         ctx_list = []
@@ -687,9 +723,9 @@ class olap_database_columns(osv.osv):
         if context['parent_id']:
             parent_id = context['parent_id']
             val = {
-            'cube_table_id':parent_id,
-            'table_id':table_id,
-            'field_id':ids[0]
+            'cube_table_id': parent_id,
+            'table_id': table_id,
+            'field_id': ids[0]
             }
             id = self.pool.get('olap.cube.table.line').create(cr, uid, val, context)
 
@@ -701,11 +737,13 @@ class olap_database_columns(osv.osv):
         return ctx_list
 
     def make_hierarchy(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ Make Hierarchy on the cube
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Hierarchy’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         col_data = self.pool.get('olap.database.columns').read(cr, uid, ids, [], context)[0]
         ctx_list = []
@@ -719,9 +757,9 @@ class olap_database_columns(osv.osv):
             pk_table = cube_table_obj.name
 
         val = {
-             'field_name':col_data['name'],
-             'name':col_data['name'],
-             'primary_key_table':pk_table
+             'field_name': col_data['name'],
+             'name': col_data['name'],
+             'primary_key_table': pk_table
         }
 
         if context['hier_parent_id']:
@@ -751,11 +789,14 @@ class olap_cube_table(osv.osv):
     _description = "Olap cube table"
 
     def write(self, cr, uid, ids, vals, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Cube Table’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param vals: Get the Value's of cube table
+            @param context: A standard dictionary for contextual values
+        """
 
         if vals and vals.get('available_table_ids', 0) and context and \
             (context.has_key('master_dim') or context.has_key('d_id') or \
@@ -816,10 +857,13 @@ class olap_cube_table(osv.osv):
             return  super(olap_cube_table, self).write(cr, uid, ids, vals, context)
 
     def create(self, cr, uid, vals, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param vals: Get the Value's of cube table
+            @param context: A standard dictionary for contextual values
+        """
 
         cube_table_id = super(olap_cube_table, self).create(cr, uid, vals, context)
 
@@ -839,22 +883,35 @@ class olap_cube_table(osv.osv):
 
     def search(self, cr, uid, args, offset = 0, limit = None, order = None,
             context = None, count = False):
+        """ olap search method.
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user’s ID for security checks,
+            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+            @param offset: The Number of Results to Pass
+            @param limit: The Number of Results to Return
+            @param context: A standard dictionary for contextual values
+        """
+
         if context and context.has_key('parent_schema_id'):
             args = [('schema_id', '=', context['parent_schema_id'])]
 
         if context and context.has_key('d_id'):
-            dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(['d_id']))
+            dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
             args = [('schema_id', '=', dim_obj.cube_id.schema_id.id)]
 
         return super(olap_cube_table, self).search(cr, uid, args, offset, limit, \
                                         order, context = context, count = count)
 
     def _available_table_get(self, cr, uid, ids, name, arg, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Available Table’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param arg: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...]
+            @param context: A standard dictionary for contextual values
+        """
 
         result = {}
         parent_table_id = []
@@ -871,10 +928,12 @@ class olap_cube_table(osv.osv):
         return result
 
     def _set_schema(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ Set Schema for cube table
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('d_id'):
             dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
@@ -884,20 +943,24 @@ class olap_cube_table(osv.osv):
             return context['parent_schema_id']
 
     def _set_name(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ set name for cube table
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('d_id'):
             dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
             return dim_obj.cubeAid.table_id.name
 
     def _get_id(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('d_id'):
             dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
@@ -914,10 +977,12 @@ class olap_cube_table(osv.osv):
         return col_ids
 
     def _def_set(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         return []
 
@@ -925,8 +990,8 @@ class olap_cube_table(osv.osv):
         'name': fields.char('Table name', size = 64, required = True),
         'line_ids': fields.one2many('olap.cube.table.line', 'cube_table_id',\
                                  'Database Tables', required = True),
-        'schema_id':fields.many2one('olap.schema', 'Schema id', ondelete = 'cascade'),
-        'column_link_id':fields.many2one('olap.database.columns', 'Relational Column' , required = True),
+        'schema_id': fields.many2one('olap.schema', 'Schema id', ondelete = 'cascade'),
+        'column_link_id': fields.many2one('olap.database.columns', 'Relational Column' , required = True),
         'available_table_ids': fields.function(
             _available_table_get,
             method = True,
@@ -937,13 +1002,16 @@ class olap_cube_table(osv.osv):
     }
 
     _defaults = {
-        'schema_id':_set_schema,
+        'schema_id': _set_schema,
     }
     def field_add(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ Add the Field for the cube table
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param ids: List of cube table’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         return {}
 
@@ -966,10 +1034,11 @@ class olap_cube_table_line(osv.osv):
     }
     # Set the Table when changing field_id
     def onchange_field_id(self, *args, **argv):
-
-        """ @param *args: For Positional Argument
-            @param **args: For Keyword Argument """
-
+        """
+            @param self: The object pointer
+            @param *args: For Positional Argument
+            @param **argv: For Keyword Argument
+        """
         pass
 
 olap_cube_table_line()
@@ -982,10 +1051,11 @@ class olap_cube(osv.osv):
     _description = "Olap cube"
 
     def _set_schema(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
+        """ set schema for olap cube
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
         """
 
         if context and context.has_key('schema_id'):
@@ -1038,10 +1108,11 @@ class olap_dimension(osv.osv):
     _description = "Olap dimension"
 
     def _set_cube(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
+        """ set cube for Olap Dimension
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
         """
 
         if context and context.has_key('cube_id'):
@@ -1076,10 +1147,11 @@ class olap_hierarchy(osv.osv):
     }
 
     def _set_dimension(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
+        """ set Dimension for Olap Hierarchy
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
         """
 
         if context and context.has_key('dimension_id'):
@@ -1087,10 +1159,11 @@ class olap_hierarchy(osv.osv):
         return False
 
     def _set_name(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
+        """ set name for Olap Hierarchy
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
         """
 
         if context and context.has_key('dimension_id'):
@@ -1099,10 +1172,11 @@ class olap_hierarchy(osv.osv):
         return False
 
     def _hierarchy_get(self, *args, **argv):
-
-        """ @param *args: For Positional Argument
-            @param **args: For Keyword Argument """
-
+        """
+            @param self: The object pointer
+            @param *args: For Positional Argument
+            @param **args: For Keyword Argument
+        """
         return self.hierarchy_type.items()
 
     _columns = {
@@ -1140,30 +1214,37 @@ class olap_level(osv.osv):
     }
 
     def _set_hierarchy(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values """
+        """ set Hierarchy for Olap Level
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('hierarchy_id'):
             return context['hierarchy_id']
         return False
 
     def _set_name(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ set name for Olap Level
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('hierarchy_id'):
             hier_obj = self.pool.get('olap.hierarchy').browse(cr, uid, int(context['hierarchy_id']))
             return hier_obj.name
 
     def onchange_column_name(self, cr, uid, ids, column, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param ids: List of Olap Level’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         if not column:
             return {}
@@ -1173,21 +1254,23 @@ class olap_level(osv.osv):
         val['column_id_name'] = col.column_db_name
         if (col.type == 'date'):
             val['type'] = 'date_year'
-        return {'value':val}
+        return {'value': val}
 
     def _type_get(self, cr, uid, *args, **argv):
-
-        """ @param *args: For Positional Argument
-        @param **args: For Keyword Argument
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param *args: For Positional Argument
+            @param **args: For Keyword Argument
         """
 
         keys = self._types.keys()
         return map(lambda x: (x,x),keys)
 
-
     _columns = {
         'name': fields.char('Level name', size = 64, required = True),
-        'column_name':fields.many2one('olap.database.columns', 'Columns Name', required = True),
+        'column_name': fields.many2one('olap.database.columns', 'Columns Name', required = True),
         'column_id_name': fields.char('Column ID', size = 64, required = True),
         'type': fields.selection(selection = _type_get, string = 'Level class', size = 64, required = True),
         'table_name': fields.char('Table name', size = 64, required = True, \
@@ -1199,8 +1282,8 @@ class olap_level(osv.osv):
 
     _defaults = {
         'column_id_name': lambda * args: 'name',
-        'sequence':lambda * args: '1',
-        'type':lambda * args:'normal',
+        'sequence': lambda * args: '1',
+        'type': lambda * args:'normal',
         'hierarchy_id': _set_hierarchy,
         'name': _set_name
     }
@@ -1214,20 +1297,25 @@ class olap_measure(osv.osv):
     _description = "Olap measure"
 
     def _set_cube(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """ set cube for Olap Measure
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         if context and context.has_key('cube_id'):
             return context['cube_id']
         return False
 
     def onchange_measure_name(self, cr, uid, ids, column, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param ids: List of Olap Measure’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         val = {}
         if not column:
@@ -1236,7 +1324,7 @@ class olap_measure(osv.osv):
         val['table_name'] = col.table_id.table_db_name
         val['value_column_id_name'] = col.column_db_name
         val['name'] = col.column_db_name
-        return {'value':val}
+        return {'value': val}
 
     _columns = {
         'name': fields.char('Measure name', size = 64, required = True),
@@ -1249,7 +1337,7 @@ class olap_measure(osv.osv):
                              ('sql_expr', 'SQL Expression')],\
                              'Measure Type', required = True,\
                              help = "Select between auto column or sql expression for the measures"),
-        'value_sql': fields.char('SQL Expression', size = 200, help = "You can \
+        'value_sql': fields.text('SQL Expression', help = "You can \
                             provide valid sql expression. Make sure it have \
                          function with fully qualified column name like \
                          (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"),
@@ -1271,7 +1359,7 @@ class olap_measure(osv.osv):
         'datatype': lambda * args: 'float',
         'formatstring': lambda * args: 'none',
         'cube_id': _set_cube,
-        'measure_type':lambda * args:'fact_column',
+        'measure_type': lambda * args:'fact_column',
     }
 
 olap_measure()
@@ -1316,7 +1404,7 @@ class olap_application_field(osv.osv):
     _columns = {
         'name': fields.char('Application field name', size = 64, required = True),
         'table_name': fields.char('Application table name', size = 64),
-        'field_name':fields.char('Field name', size = 64),
+        'field_name': fields.char('Field name', size = 64),
         'is_hidden': fields.boolean('Hidden'),
         'application_id': fields.many2one('olap.application', 'Application Id', required = True),
     }
@@ -1348,10 +1436,12 @@ class bi_load_db_wizard(osv.osv_memory):
     _name = 'bi.load.db.wizard'
 
     def _get_fact_table(self, cr, uid, ctx):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param ctx: A standard dictionary for contextual values """
+            @param ctx: A standard dictionary for contextual values
+        """
 
         if ctx and ctx.has_key('active_id'):
             schema_obj = self.pool.get('olap.schema').browse(cr, uid, ctx['active_id'])
@@ -1359,10 +1449,12 @@ class bi_load_db_wizard(osv.osv_memory):
         return False
 
     def _get_db_name(self, cr, uid, ctx):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param ctx: A standard dictionary for contextual values """
+            @param ctx: A standard dictionary for contextual values
+        """
 
         if ctx and ctx.has_key('active_id'):
             schema_obj = self.pool.get('olap.schema').browse(cr, uid, ctx['active_id'])
@@ -1370,8 +1462,8 @@ class bi_load_db_wizard(osv.osv_memory):
         return False
 
     _columns = {
-        'fact_table':fields.char('Fact Name' , size = 64, readonly = True),
-        'db_name':fields.char('Database Name', size = 64, readonly = True)
+        'fact_table': fields.char('Fact Name' , size = 64, readonly = True),
+        'db_name': fields.char('Database Name', size = 64, readonly = True)
     }
 
     _defaults = {
@@ -1380,11 +1472,13 @@ class bi_load_db_wizard(osv.osv_memory):
     }
 
     def action_load(self, cr, uid, ids, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: Load Action’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         data = context and context.get('active_id', False) or False
         if context and context.has_key('active_id'):
@@ -1413,8 +1507,8 @@ class bi_load_db_wizard(osv.osv_memory):
                         INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
                 for table in cr_db.fetchall():
                     val = {
-                        'fact_database_id':id_db,
-                        'table_db_name':table[0]
+                        'fact_database_id': id_db,
+                        'table_db_name': table[0]
                     }
                     if table[0] in tables.keys():
                         table_id = tobj.write(cr, uid, [tables[table[0]]], val, context)
@@ -1480,7 +1574,7 @@ class bi_load_db_wizard(osv.osv_memory):
                 print "Updating the Primary Key Constraint"
                 for constraint in cr_db.fetchall():
                     val = {
-                        'primary_key':True
+                        'primary_key': True
                     }
 
                     id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and(constraint[1] == cols[x][0])), cols)
@@ -1510,7 +1604,7 @@ class bi_load_db_wizard(osv.osv_memory):
 
                 for constraint in cr_db.fetchall():
                     val = {
-                        'related_to':tables[for_key[constraint[2]]]
+                        'related_to': tables[for_key[constraint[2]]]
                     }
                     id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])\
                                                 and (constraint[1] == cols[x][0])), cols)
@@ -1550,8 +1644,8 @@ class bi_load_db_wizard(osv.osv_memory):
 
                 for table in cr_db.fetchall():
                     val = {
-                        'fact_database_id':id_db,
-                        'table_db_name':table[0]
+                        'fact_database_id': id_db,
+                        'table_db_name': table[0]
                     }
 
                     if table[0] in tables.keys():
@@ -1596,12 +1690,12 @@ class bi_load_db_wizard(osv.osv_memory):
 
                     if constraint[0]:
                         val = {
-                             'related_to':tables[constraint[1]]
+                             'related_to': tables[constraint[1]]
                              }
                     else:
 
                         val = {
-                             'primary_key':True
+                             'primary_key': True
                              }
                     id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[3]])and \
                                                 (constraint[2] == cols[x][0])), cols)
@@ -1639,8 +1733,8 @@ class bi_load_db_wizard(osv.osv_memory):
                 temp = cr_db.fetchall()
                 for table in temp:
                     val = {
-                        'fact_database_id':id_db,
-                        'table_db_name':table[0]
+                        'fact_database_id': id_db,
+                        'table_db_name': table[0]
                     }
 
                     if table[0] in tables.keys():
@@ -1742,16 +1836,17 @@ class bi_load_db_wizard(osv.osv_memory):
             resource_id = self.pool.get('ir.model.data').read(cr, uid, \
                                     model_data_ids, fields = ['res_id'])[0]['res_id']
 
-            return {'type':'ir.actions.act_window_close' }
+            return {'type': 'ir.actions.act_window_close' }
 
     def action_cancel(self, cr, uid, ids, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of create menu’s IDs
-            @param context: A standard dictionary for contextual values """
-
-        return {'type':'ir.actions.act_window_close' }
+            @param context: A standard dictionary for contextual values
+        """
+        return {'type': 'ir.actions.act_window_close' }
 
 bi_load_db_wizard()
 # Wizard for the Automatic Application Configuration
@@ -1760,10 +1855,12 @@ class bi_auto_configure_wizard(osv.osv_memory):
     _name = 'bi.auto.configure.wizard'
 
     def _get_name(self, cr, uid, context):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         data = context and context.get('active_id', False) or False
         if context and context.has_key('active_id'):
@@ -1772,20 +1869,21 @@ class bi_auto_configure_wizard(osv.osv_memory):
         return False
 
     _columns = {
-        'name':fields.char('Fact Name' , size = 64, readonly = True),
-
+        'name': fields.char('Fact Name' , size = 64, readonly = True),
         }
 
     _defaults = {
-                   'name':_get_name,
+                   'name': _get_name,
                    }
 
     def action_load(self, cr, uid, ids, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of create menu’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         vals = {}
         apptabnew_vals = {}
@@ -1931,11 +2029,18 @@ class bi_auto_configure_wizard(osv.osv_memory):
             resource_id = self.pool.get('ir.model.data').read(cr, uid, \
                                 model_data_ids, fields = ['res_id'])[0]['res_id']
 
-            return {'type':'ir.actions.act_window_close' }
+            return {'type': 'ir.actions.act_window_close' }
 
     def action_cancel(self, cr, uid, ids, context = None):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of create menu’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
-        return {'type':'ir.actions.act_window_close' }
+        return {'type': 'ir.actions.act_window_close' }
 
 bi_auto_configure_wizard()
 
@@ -1947,10 +2052,12 @@ class olap_warehouse_wizard(osv.osv_memory):
     _description = "Olap Warehouse"
 
     def _get_queries(self, cr, uid, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         query_obj = self.pool.get('olap.query.logs')
         qry_ids = query_obj.search(cr, uid, [('user_id', '=', uid), ('count', '>=', 3)])
@@ -1967,20 +2074,23 @@ class olap_warehouse_wizard(osv.osv_memory):
         else:
             return ''
     def action_ok(self, cr, uid, ids, context = {}):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of Action’s IDs
-            @param context: A standard dictionary for contextual values """
-        return {'type':'ir.actions.act_window_close' }
+            @param context: A standard dictionary for contextual values
+        """
+        return {'type': 'ir.actions.act_window_close' }
 
     _columns = {
-                'query':fields.text('Query', readonly=True),
+                'query': fields.text('Query', readonly=True),
                 }
 
     _defaults = {
         'query': _get_queries,
         }
+
 olap_warehouse_wizard()
 
 
@@ -1990,11 +2100,12 @@ class olap_parameters_config_wizard(osv.osv_memory):
     _description = "Olap Server Parameters"
 
     def _get_host(self, cr, uid, context = None):
-
         """ Get Host ID
+            @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         obj = self.pool.get('olap')
         objid = self.pool.get('ir.model.data')
@@ -2008,11 +2119,12 @@ class olap_parameters_config_wizard(osv.osv_memory):
         return s_p.parseString(aid.url)[0]
 
     def _get_port(self, cr, uid, context = None):
-
         """ Get Port
+            @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         obj = self.pool.get('olap')
         objid = self.pool.get('ir.model.data')
@@ -2026,9 +2138,9 @@ class olap_parameters_config_wizard(osv.osv_memory):
         return s_p.parseString(aid.url)[1]
 
     _columns = {
-        'host_name' : fields.char('Server Name', size = 64, help = "Put here the server address or IP \
+        'host_name': fields.char('Server Name', size = 64, help = "Put here the server address or IP \
                 Put localhost if its not clear.", required = True),
-        'host_port' : fields.char('Port', size = 4, help = "Put the port for the server. Put 8080 if \
+        'host_port': fields.char('Port', size = 4, help = "Put the port for the server. Put 8080 if \
                 its not clear.", required = True),
             }
 
@@ -2038,11 +2150,13 @@ class olap_parameters_config_wizard(osv.osv_memory):
         }
 
     def action_cancel(self, cr, uid, ids, conect = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
-            @param ids: List of create menu’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param ids: List of olap parameter’s IDs
+            @param context: A standard dictionary for contextual values
+        """
 
         return {
                 'view_type': 'form',
@@ -2053,11 +2167,13 @@ class olap_parameters_config_wizard(osv.osv_memory):
          }
 
     def action_config(self, cr, uid, ids, context = None):
-
-        """ @param cr: the current row, from the database cursor,
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of create menu’s IDs
-            @param context: A standard dictionary for contextual values """
+            @param context: A standard dictionary for contextual values
+        """
 
         conf = self.browse(cr, uid, ids[0], context)
         obj = self.pool.get('olap')
diff --git a/addons/olap/wizard/olap_load_column.py b/addons/olap/wizard/olap_load_column.py
old mode 100755
new mode 100644
diff --git a/addons/olap/wizard/olap_query_logs_clear.py b/addons/olap/wizard/olap_query_logs_clear.py
old mode 100755
new mode 100644
diff --git a/addons/olap_crm/__terp__.py b/addons/olap_crm/__openerp__.py
similarity index 100%
rename from addons/olap_crm/__terp__.py
rename to addons/olap_crm/__openerp__.py
diff --git a/addons/olap_crm/i18n/es.po b/addons/olap_crm/i18n/es.po
index 8f5dc3d1fa4..333442a4d62 100644
--- a/addons/olap_crm/i18n/es.po
+++ b/addons/olap_crm/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-12 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
diff --git a/addons/olap_crm/i18n/hr.po b/addons/olap_crm/i18n/hr.po
index caf2d334f7e..3e78ccf8201 100644
--- a/addons/olap_crm/i18n/hr.po
+++ b/addons/olap_crm/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
diff --git a/addons/olap_crm/i18n/oc.po b/addons/olap_crm/i18n/oc.po
index 7622a3a5860..7e1a293fcb5 100644
--- a/addons/olap_crm/i18n/oc.po
+++ b/addons/olap_crm/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
diff --git a/addons/olap_crm/i18n/pl.po b/addons/olap_crm/i18n/pl.po
new file mode 100644
index 00000000000..13d7b13210a
--- /dev/null
+++ b/addons/olap_crm/i18n/pl.po
@@ -0,0 +1,31 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-04-14 10:45+0000\n"
+"Last-Translator: Krystian Twardowski <Unknown>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_crm
+#: model:ir.module.module,description:olap_crm.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_crm
+#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
+msgid "olap_crm"
+msgstr "olap_crm"
diff --git a/addons/olap_crm/i18n/pt_BR.po b/addons/olap_crm/i18n/pt_BR.po
index 5f334412dc1..976548e1bb6 100644
--- a/addons/olap_crm/i18n/pt_BR.po
+++ b/addons/olap_crm/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
diff --git a/addons/olap_crm/i18n/sk.po b/addons/olap_crm/i18n/sk.po
index bc008d38458..af1fb56fcdb 100644
--- a/addons/olap_crm/i18n/sk.po
+++ b/addons/olap_crm/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
diff --git a/addons/olap_crm/i18n/sl.po b/addons/olap_crm/i18n/sl.po
index b5d01936cbd..9b17316994b 100644
--- a/addons/olap_crm/i18n/sl.po
+++ b/addons/olap_crm/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
diff --git a/addons/olap_extract/__terp__.py b/addons/olap_extract/__openerp__.py
similarity index 100%
rename from addons/olap_extract/__terp__.py
rename to addons/olap_extract/__openerp__.py
diff --git a/addons/olap_extract/i18n/bg.po b/addons/olap_extract/i18n/bg.po
index 08e26af08ad..b659636fdbb 100644
--- a/addons/olap_extract/i18n/bg.po
+++ b/addons/olap_extract/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_extract/i18n/de.po b/addons/olap_extract/i18n/de.po
index e85b31fdae7..1454fd7d5f1 100644
--- a/addons/olap_extract/i18n/de.po
+++ b/addons/olap_extract/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_extract/i18n/es.po b/addons/olap_extract/i18n/es.po
index 80a8efb5cd1..f02f5c6b282 100644
--- a/addons/olap_extract/i18n/es.po
+++ b/addons/olap_extract/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-13 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_extract/i18n/hr.po b/addons/olap_extract/i18n/hr.po
index 76f29eee142..e46b86825ec 100644
--- a/addons/olap_extract/i18n/hr.po
+++ b/addons/olap_extract/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_extract/i18n/oc.po b/addons/olap_extract/i18n/oc.po
index 499a36efce1..92d355472c1 100644
--- a/addons/olap_extract/i18n/oc.po
+++ b/addons/olap_extract/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_extract/i18n/pt_BR.po b/addons/olap_extract/i18n/pt_BR.po
index d4c3fe1173e..dd543218f3f 100644
--- a/addons/olap_extract/i18n/pt_BR.po
+++ b/addons/olap_extract/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_extract/i18n/ru.po b/addons/olap_extract/i18n/ru.po
index 5556d61f088..5bebc09096c 100644
--- a/addons/olap_extract/i18n/ru.po
+++ b/addons/olap_extract/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_extract/i18n/sl.po b/addons/olap_extract/i18n/sl.po
index 3e6bf9c1c16..61e1f8f64f2 100644
--- a/addons/olap_extract/i18n/sl.po
+++ b/addons/olap_extract/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_extract/i18n/sv.po b/addons/olap_extract/i18n/sv.po
index a08c350d0bb..ecfa760dbe9 100644
--- a/addons/olap_extract/i18n/sv.po
+++ b/addons/olap_extract/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_extract/i18n/zh_CN.po b/addons/olap_extract/i18n/zh_CN.po
index 2238c9cd481..d38f5a530e8 100644
--- a/addons/olap_extract/i18n/zh_CN.po
+++ b/addons/olap_extract/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-10 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract
diff --git a/addons/olap_sale/__terp__.py b/addons/olap_sale/__openerp__.py
similarity index 100%
rename from addons/olap_sale/__terp__.py
rename to addons/olap_sale/__openerp__.py
diff --git a/addons/olap_sale/i18n/de.po b/addons/olap_sale/i18n/de.po
new file mode 100644
index 00000000000..d95537215f2
--- /dev/null
+++ b/addons/olap_sale/i18n/de.po
@@ -0,0 +1,31 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-04-17 19:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr ""
diff --git a/addons/olap_sale/i18n/hr.po b/addons/olap_sale/i18n/hr.po
index a4225ec45d5..b6af5b3a572 100644
--- a/addons/olap_sale/i18n/hr.po
+++ b/addons/olap_sale/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_sale
diff --git a/addons/olap_sale/i18n/pt_BR.po b/addons/olap_sale/i18n/pt_BR.po
index 52c92d2802b..73079a2b26e 100644
--- a/addons/olap_sale/i18n/pt_BR.po
+++ b/addons/olap_sale/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_sale
diff --git a/addons/olap_sale/i18n/ro.po b/addons/olap_sale/i18n/ro.po
new file mode 100644
index 00000000000..16ad2a4409e
--- /dev/null
+++ b/addons/olap_sale/i18n/ro.po
@@ -0,0 +1,34 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-04-15 10:48+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_sale
+#: model:ir.module.module,description:olap_sale.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+"\n"
+"    Modulul de vânzări va încărca datele în tabelele olap\n"
+"    "
+
+#. module: olap_sale
+#: model:ir.module.module,shortdesc:olap_sale.module_meta_information
+msgid "olap_sale"
+msgstr "olap_sale"
diff --git a/addons/olap_sale/i18n/sk.po b/addons/olap_sale/i18n/sk.po
index 421badd8f7f..d86e4538308 100644
--- a/addons/olap_sale/i18n/sk.po
+++ b/addons/olap_sale/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_sale
diff --git a/addons/olap_sale/i18n/sl.po b/addons/olap_sale/i18n/sl.po
index b3f0f6b9bdf..608edb6a26c 100644
--- a/addons/olap_sale/i18n/sl.po
+++ b/addons/olap_sale/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_sale
diff --git a/addons/partner_crm/__terp__.py b/addons/partner_crm/__openerp__.py
similarity index 100%
rename from addons/partner_crm/__terp__.py
rename to addons/partner_crm/__openerp__.py
diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__openerp__.py
similarity index 100%
rename from addons/point_of_sale/__terp__.py
rename to addons/point_of_sale/__openerp__.py
diff --git a/addons/point_of_sale/i18n/ar.po b/addons/point_of_sale/i18n/ar.po
index a9a5738e625..b7afc1888b1 100644
--- a/addons/point_of_sale/i18n/ar.po
+++ b/addons/point_of_sale/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po
index 29955e416db..e12306ce9e9 100644
--- a/addons/point_of_sale/i18n/bg.po
+++ b/addons/point_of_sale/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/bs.po b/addons/point_of_sale/i18n/bs.po
index bd15f1b7e62..8197c6969f5 100644
--- a/addons/point_of_sale/i18n/bs.po
+++ b/addons/point_of_sale/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po
index 256f03a79bb..71100d6b450 100644
--- a/addons/point_of_sale/i18n/ca.po
+++ b/addons/point_of_sale/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/cs.po b/addons/point_of_sale/i18n/cs.po
index 1b55794e8e0..636d6b9333e 100644
--- a/addons/point_of_sale/i18n/cs.po
+++ b/addons/point_of_sale/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index 63cd1027ff0..b85acec1469 100644
--- a/addons/point_of_sale/i18n/da.po
+++ b/addons/point_of_sale/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index 4024ef6bb9b..d71c38365b6 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/el.po b/addons/point_of_sale/i18n/el.po
index 71b5d4907e0..7634106bb61 100644
--- a/addons/point_of_sale/i18n/el.po
+++ b/addons/point_of_sale/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 68118434d14..28fcdf81333 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index f79817cb174..b91cb389d60 100644
--- a/addons/point_of_sale/i18n/es_AR.po
+++ b/addons/point_of_sale/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/et.po b/addons/point_of_sale/i18n/et.po
index 9bdd585ac6c..e26b8324fbc 100644
--- a/addons/point_of_sale/i18n/et.po
+++ b/addons/point_of_sale/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/fi.po b/addons/point_of_sale/i18n/fi.po
index d0fe7695c55..e32d9627e67 100644
--- a/addons/point_of_sale/i18n/fi.po
+++ b/addons/point_of_sale/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index d8e65c7e133..6ae0cfda0bb 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 90ee1f881f1..0059e68b1ca 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index a9a5738e625..b7afc1888b1 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/id.po b/addons/point_of_sale/i18n/id.po
index eac5cdd5db9..102a9067f17 100644
--- a/addons/point_of_sale/i18n/id.po
+++ b/addons/point_of_sale/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index f0f6aff03c2..51312776943 100644
--- a/addons/point_of_sale/i18n/it.po
+++ b/addons/point_of_sale/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ko.po b/addons/point_of_sale/i18n/ko.po
index 980d0699064..0282db22e75 100644
--- a/addons/point_of_sale/i18n/ko.po
+++ b/addons/point_of_sale/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index a41fc61bed5..2c5a4ab2b65 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/mn.po b/addons/point_of_sale/i18n/mn.po
index f02fc8ac4af..de2f6d41205 100644
--- a/addons/point_of_sale/i18n/mn.po
+++ b/addons/point_of_sale/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index bfb81ef1ec7..601da4d0e93 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po
index c7a55945229..91a1f252a02 100644
--- a/addons/point_of_sale/i18n/nl_BE.po
+++ b/addons/point_of_sale/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/pl.po b/addons/point_of_sale/i18n/pl.po
index d6956bdd6e9..f0495ccafb7 100644
--- a/addons/point_of_sale/i18n/pl.po
+++ b/addons/point_of_sale/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -519,7 +519,7 @@ msgstr "Dodaj"
 #. module: point_of_sale
 #: selection:pos.order,state:0
 msgid "Draft"
-msgstr "wer.robocza"
+msgstr "Projekt"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
diff --git a/addons/point_of_sale/i18n/pt.po b/addons/point_of_sale/i18n/pt.po
index c49db5fcb91..285ba374a0d 100644
--- a/addons/point_of_sale/i18n/pt.po
+++ b/addons/point_of_sale/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index 313bd2a7e8a..f8639b663a2 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index 6029749d869..491c7c2f56a 100644
--- a/addons/point_of_sale/i18n/ro.po
+++ b/addons/point_of_sale/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index 98fec529fd4..fd1eda0c478 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sl.po b/addons/point_of_sale/i18n/sl.po
index 25c2845d02e..568d923eca9 100644
--- a/addons/point_of_sale/i18n/sl.po
+++ b/addons/point_of_sale/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index a0d9e3cf80f..47ccaf18361 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index 6d05e5ac543..d946223a8e8 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tlh.po b/addons/point_of_sale/i18n/tlh.po
index 009f8111b9a..5844644cfc6 100644
--- a/addons/point_of_sale/i18n/tlh.po
+++ b/addons/point_of_sale/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+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 1f01a49ebd6..2c8df42b9c5 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po
index f940699a655..20c7614889d 100644
--- a/addons/point_of_sale/i18n/uk.po
+++ b/addons/point_of_sale/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index f17d7720f4e..78d801dc1c0 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/zh_HK.po b/addons/point_of_sale/i18n/zh_HK.po
index 70322d3b49b..a5153fbdf2a 100644
--- a/addons/point_of_sale/i18n/zh_HK.po
+++ b/addons/point_of_sale/i18n/zh_HK.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po
index fa9547755ad..5006a3080c0 100644
--- a/addons/point_of_sale/i18n/zh_TW.po
+++ b/addons/point_of_sale/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index a214cc9fe86..a4cd8fc9f10 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -13,7 +13,7 @@
                             <group colspan="4" col="6">
                                 <field name="user_saleman" />
                                 <field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
-                                <field name="contract_number" select="1" />
+                                <field name="contract_number" select="1" groups="base.group_extended"/>
                             </group>
                             <field name="lines" colspan="4" nolabel="1">
                                 <tree string="Order lines" editable="bottom">
@@ -50,13 +50,13 @@
                             <group colspan="4" col="9" groups="base.group_extended">
                             <separator colspan="4" string="Validation of the Sale"/>
                                 <newline/>
-                                <field name="state_2" select="2" />
+                                <field name="state_2" />
                                 <button name="button_validate"
-                                		string="Accept"
-                                		type="object"
+                                        string="Accept"
+                                        type="object"
                                      icon="gtk-ok"
                                     states="paid, draft"
-                                		attrs="{'invisible':[('state_2','=','accepted')]}"/>
+                                        attrs="{'invisible':[('state_2','=','accepted')]}"/>
                               </group>
 
                             <separator colspan="4" string="Actions"/>
@@ -194,7 +194,7 @@
         <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
-		<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
+        <menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
 
         <!--  POS Order view (date_payment)  -->
          <record model="ir.actions.act_window" id="action_pos_pos_form_user">
@@ -210,7 +210,7 @@
         </record>
 invoiced
 
-		<record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
+        <record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
             <field name="name">Sales to Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
@@ -222,7 +222,7 @@ invoiced
 		    	             
         </record>
         <menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="4" />
-		<menuitem name="Sales to Invoice" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
+        <menuitem name="Sales to Invoice" 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>
@@ -288,8 +288,8 @@ invoiced
                 <form string="POS Order line">
                     <field name="product_id"  select="1"/>
                     <field name="qty"  select="1"/>
-                    <field name="discount"  select="2"/>
-                    <field name="price_unit"  select="2"/>
+                    <field name="discount" />
+                    <field name="price_unit" />
                     <field name="create_date"  select="1"/>
                 </form>
             </field>
@@ -304,7 +304,7 @@ invoiced
             <field name="view_id" ref="view_pos_order_line"/>
         </record>
 
-		<record model="ir.actions.act_window" id="action_pos_order_line_form">
+        <record model="ir.actions.act_window" id="action_pos_order_line_form">
             <field name="name">Sale line</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order.line</field>
@@ -337,9 +337,9 @@ invoiced
                     <field name="journal_id" select="1"/>
                     <field name="jl_id" select="1"/>
                     <field name="date_create" select="1" widget="date"/>
-                    <field name="no_trans" select="2"/>
-                    <field name="amount" select="2"/>
-                    <field name="invoice_id" select="2"/>
+                    <field name="no_trans"/>
+                    <field name="amount"/>
+                    <field name="invoice_id"/>
                 </form>
             </field>
         </record>
@@ -365,31 +365,31 @@ invoiced
         </record>
 
         <record model="ir.ui.view" id="view_report_transaction_pos_calendar">
-	        <field name="name">report.transaction.pos.calendar</field>
-	        <field name="model">report.transaction.pos</field>
-	        <field name="type">calendar</field>
-	        <field eval="2" name="priority"/>
-	        <field name="arch" type="xml">
-	            <calendar color="user_id" date_start="date_create" string="POS Report">
-	                <field name="journal_id"/>
-	                <field name="amount"/>
-	            </calendar>
-	        </field>
-	     </record>
+            <field name="name">report.transaction.pos.calendar</field>
+            <field name="model">report.transaction.pos</field>
+            <field name="type">calendar</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <calendar color="user_id" date_start="date_create" string="POS Report">
+                    <field name="journal_id"/>
+                    <field name="amount"/>
+                </calendar>
+            </field>
+         </record>
 
-	     <record model="ir.ui.view" id="view_report_transaction_pos_graph">
-	        <field name="name">report.transaction.pos.graph</field>
-	        <field name="model">report.transaction.pos</field>
-	        <field name="type">graph</field>
-	        <field eval="2" name="priority"/>
-	        <field name="arch" type="xml">
-	            <graph  type="bar" string="POS Report">
-	                <field name="user_id" />
-	                <field name="amount"/>
-	                <field group="True" name="journal_id"/>
-	            </graph>
-	        </field>
-	     </record>
+         <record model="ir.ui.view" id="view_report_transaction_pos_graph">
+            <field name="name">report.transaction.pos.graph</field>
+            <field name="model">report.transaction.pos</field>
+            <field name="type">graph</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <graph  type="bar" string="POS Report">
+                    <field name="user_id" />
+                    <field name="amount"/>
+                    <field group="True" name="journal_id"/>
+                </graph>
+            </field>
+         </record>
 
         <record model="ir.actions.act_window" id="action_trans_pos_tree_today">
             <field name="name">Sales by day</field>
@@ -418,16 +418,16 @@ invoiced
         </record>
 
 
-		<record model="ir.ui.view" id="view_report_sales_by_user_pos_form">
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_form">
             <field name="name">report.sales.by.user.pos.form</field>
             <field name="model">report.sales.by.user.pos</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="amount" select="2"/>
-                    <field name="user_id" select="2"/>
+                    <field name="qty"/>
+                    <field name="amount"/>
+                    <field name="user_id"/>
                 </form>
             </field>
         </record>
@@ -440,60 +440,60 @@ invoiced
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="amount" select="2"/>
-                    <field name="user_id" select="2"/>
+                    <field name="qty"/>
+                    <field name="amount"/>
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
 
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_calendar">
-	        <field name="name">report.sales.by.user.pos.calendar</field>
-	        <field name="model">report.sales.by.user.pos</field>
-	        <field name="type">calendar</field>
-	        <field eval="2" name="priority"/>
-	        <field name="arch" type="xml">
-	            <calendar color="user_id" date_start="date_order" string="POS Report">
-	            	<field name="qty" select="2"/>
-	                <field name="amount" />
-	            </calendar>
-	        </field>
-	     </record>
+            <field name="name">report.sales.by.user.pos.calendar</field>
+            <field name="model">report.sales.by.user.pos</field>
+            <field name="type">calendar</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <calendar color="user_id" date_start="date_order" string="POS Report">
+                    <field name="qty"/>
+                    <field name="amount" />
+                </calendar>
+            </field>
+         </record>
 
-		<record model="ir.ui.view" id="view_report_sales_by_user_pos_graph">
-	        <field name="name">report.sales.by.user.pos.graph</field>
-	        <field name="model">report.sales.by.user.pos</field>
-	        <field name="type">graph</field>
-	        <field eval="2" name="priority"/>
-	        <field name="arch" type="xml">
-	            <graph  type="bar" string="Sales by User">
-	                <field name="user_id" />
-	                <field name="amount"/>
-	            </graph>
-	        </field>
-	     </record>
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_graph">
+            <field name="name">report.sales.by.user.pos.graph</field>
+            <field name="model">report.sales.by.user.pos</field>
+            <field name="type">graph</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <graph  type="bar" string="Sales by User">
+                    <field name="user_id" />
+                    <field name="amount"/>
+                </graph>
+            </field>
+         </record>
 
-	     <record model="ir.actions.act_window" id="action_report_sales_by_user_pos_today">
+         <record model="ir.actions.act_window" id="action_report_sales_by_user_pos_today">
             <field name="name">Sales by User</field>
             <field name="res_model">report.sales.by.user.pos</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,calendar,form,graph</field>
             <field name="domain">[('date_order','=',time.strftime('%Y-%m-%d'))]</field>
- 		</record>
+         </record>
 
 
-		<!-- Sales of user by month -->
+        <!-- Sales of user by month -->
 
-		<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_form">
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_form">
             <field name="name">report.sales.by.user.pos.month.form</field>
             <field name="model">report.sales.by.user.pos.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="amount" select="2"/>
-                    <field name="user_id" select="2"/>
+                    <field name="qty"/>
+                    <field name="amount"/>
+                    <field name="user_id"/>
                 </form>
             </field>
         </record>
@@ -506,62 +506,62 @@ invoiced
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="amount" select="2"/>
-                    <field name="user_id" select="2"/>
+                    <field name="qty"/>
+                    <field name="amount"/>
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
 
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_calendar">
-	        <field name="name">report.sales.by.user.pos.month.calendar</field>
-	        <field name="model">report.sales.by.user.pos.month</field>
-	        <field name="type">calendar</field>
-	        <field eval="2" name="priority"/>
-	        <field name="arch" type="xml">
-	            <calendar color="user_id" date_start="date_order" string="POS Report">
-	            	<field name="qty" select="2"/>
-	                <field name="amount" />
-	            </calendar>
-	        </field>
-	     </record>
+            <field name="name">report.sales.by.user.pos.month.calendar</field>
+            <field name="model">report.sales.by.user.pos.month</field>
+            <field name="type">calendar</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <calendar color="user_id" date_start="date_order" string="POS Report">
+                    <field name="qty"/>
+                    <field name="amount" />
+                </calendar>
+            </field>
+         </record>
 
-		<record model="ir.ui.view" id="view_report_sales_by_user_pos_month_graph">
-	        <field name="name">report.sales.by.user.pos.month.graph</field>
-	        <field name="model">report.sales.by.user.pos.month</field>
-	        <field name="type">graph</field>
-	        <field eval="2" name="priority"/>
-	        <field name="arch" type="xml">
-	            <graph  type="bar" string="Sales by User">
-	                <field name="user_id" />
-	                <field name="amount"/>
-	            </graph>
-	        </field>
-	     </record>
+        <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_graph">
+            <field name="name">report.sales.by.user.pos.month.graph</field>
+            <field name="model">report.sales.by.user.pos.month</field>
+            <field name="type">graph</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <graph  type="bar" string="Sales by User">
+                    <field name="user_id" />
+                    <field name="amount"/>
+                </graph>
+            </field>
+         </record>
 
 
- 		<record model="ir.actions.act_window" id="action_report_sales_by_user_pos_month">
+         <record model="ir.actions.act_window" id="action_report_sales_by_user_pos_month">
             <field name="name">Sales by User Monthly</field>
             <field name="res_model">report.sales.by.user.pos.month</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,calendar,form,graph</field>
             <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
-		</record>
+        </record>
 
-		<!-- Sales by margin -->
+        <!-- Sales by margin -->
 
-		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_form">
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_form">
             <field name="name">report.sales.by.margin.pos.form</field>
             <field name="model">report.sales.by.margin.pos</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                	<field name="user_id" select="2"/>
-                	<field name="product_name" select="2"/>
+                    <field name="user_id"/>
+                    <field name="product_name"/>
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="net_margin_per_qty" select="2"/>
-                    <field name="total" select="2"/>
+                    <field name="qty"/>
+                    <field name="net_margin_per_qty"/>
+                    <field name="total"/>
                 </form>
             </field>
         </record>
@@ -573,41 +573,41 @@ invoiced
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
-                    <field name="user_id" select="2"/>
-                	<field name="product_name" select="2"/>
+                    <field name="user_id"/>
+                    <field name="product_name"/>
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="net_margin_per_qty" select="2"/>
-                    <field name="total" select="2"/>
+                    <field name="qty"/>
+                    <field name="net_margin_per_qty"/>
+                    <field name="total"/>
                 </tree>
             </field>
         </record>
 
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_calendar">
-	        <field name="name">report.sales.by.margin.pos.calendar</field>
-	        <field name="model">report.sales.by.margin.pos</field>
-	        <field name="type">calendar</field>
-	        <field eval="2" name="priority"/>
-	        <field name="arch" type="xml">
-	            <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
-	            	<field name="product_name" select="2"/>
-	                <field name="total" />
-	            </calendar>
-	        </field>
-	     </record>
+            <field name="name">report.sales.by.margin.pos.calendar</field>
+            <field name="model">report.sales.by.margin.pos</field>
+            <field name="type">calendar</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
+                    <field name="product_name"/>
+                    <field name="total" />
+                </calendar>
+            </field>
+         </record>
 
-		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_graph">
-	        <field name="name">report.sales.by.margin.pos.graph</field>
-	        <field name="model">report.sales.by.margin.pos</field>
-	        <field name="type">graph</field>
-	        <field eval="2" name="priority"/>
-	        <field name="arch" type="xml">
-	            <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
-	                <field name="product_name" />
-	                <field name="total" operator="+"/>
-	            </graph>
-	        </field>
-	     </record>
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_graph">
+            <field name="name">report.sales.by.margin.pos.graph</field>
+            <field name="model">report.sales.by.margin.pos</field>
+            <field name="type">graph</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
+                    <field name="product_name" />
+                    <field name="total" operator="+"/>
+                </graph>
+            </field>
+         </record>
 
         <record model="ir.actions.act_window" id="action_report_sales_by_margin_pos_today">
             <field name="name">Sales by User Daily margin</field>
@@ -615,20 +615,20 @@ invoiced
             <field name="view_type">form</field>
             <field name="view_mode">tree,calendar,form,graph</field>
             <field name="domain">[('date_order','=',time.strftime('%Y-%m-%d'))]</field>
- 		</record>
+         </record>
 
- 		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_form">
+         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_form">
             <field name="name">report.sales.by.margin.pos.month.form</field>
             <field name="model">report.sales.by.margin.pos.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS ">
-                	<field name="user_id" select="2"/>
-                	<field name="product_name" select="2"/>
+                    <field name="user_id"/>
+                    <field name="product_name"/>
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="net_margin_per_qty" select="2"/>
-                    <field name="total" select="2"/>
+                    <field name="qty"/>
+                    <field name="net_margin_per_qty"/>
+                    <field name="total"/>
                 </form>
             </field>
         </record>
@@ -640,64 +640,100 @@ invoiced
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
-                    <field name="user_id" select="2"/>
-                	<field name="product_name" select="2"/>
+                    <field name="user_id"/>
+                    <field name="product_name"/>
                     <field name="date_order" select="1" widget="date"/>
-                    <field name="qty" select="2"/>
-                    <field name="net_margin_per_qty" select="2"/>
-                    <field name="total" select="2"/>
+                    <field name="qty"/>
+                    <field name="net_margin_per_qty"/>
+                    <field name="total"/>
                 </tree>
             </field>
         </record>
 
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_calendar">
-	        <field name="name">report.sales.by.margin.pos.month.calendar</field>
-	        <field name="model">report.sales.by.margin.pos.month</field>
-	        <field name="type">calendar</field>
-	        <field eval="2" name="priority"/>
-	        <field name="arch" type="xml">
-	            <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
-	            	<field name="product_name" select="2"/>
-	                <field name="total" />
-	            </calendar>
-	        </field>
-	     </record>
+            <field name="name">report.sales.by.margin.pos.month.calendar</field>
+            <field name="model">report.sales.by.margin.pos.month</field>
+            <field name="type">calendar</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
+                    <field name="product_name"/>
+                    <field name="total" />
+                </calendar>
+            </field>
+         </record>
 
-		<record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_graph">
-	        <field name="name">report.sales.by.margin.pos.month.graph</field>
-	        <field name="model">report.sales.by.margin.pos.month</field>
-	        <field name="type">graph</field>
-	        <field eval="2" name="priority"/>
-	        <field name="arch" type="xml">
-	            <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
-	                <field name="product_name" />
-	                <field name="total" operator="+"/>
-	            </graph>
-	        </field>
-	     </record>
+        <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_graph">
+            <field name="name">report.sales.by.margin.pos.month.graph</field>
+            <field name="model">report.sales.by.margin.pos.month</field>
+            <field name="type">graph</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
+                    <field name="product_name" />
+                    <field name="total" operator="+"/>
+                </graph>
+            </field>
+         </record>
 
- 		<record model="ir.actions.act_window" id="action_report_sales_by_margin_pos_month">
+         <record model="ir.actions.act_window" id="action_report_sales_by_margin_pos_month">
             <field name="name">Sales by User Monthly margin</field>
             <field name="res_model">report.sales.by.margin.pos.month</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,calendar,form,graph</field>
             <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
-		</record>
-		<!--  Sales by margin ends -->
-    	<record model="ir.ui.view" id="view_company_form_pos">
+        </record>
+        <!--  Sales by margin ends -->
+        <record model="ir.ui.view" id="view_company_form_pos">
             <field name="name">view.company.form.pos</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-				<notebook position="inside">
+                <notebook position="inside">
                     <page string="Other">
                       <field  name="company_discount" colspan="4"/>
                       <field  name="max_diff" colspan="4"/>
                     </page>
                 </notebook>
-        	</field>
-       	</record>
+            </field>
+           </record>
+
+
+        <record model="ir.ui.view" id="form_mode_p_contact">
+            <field name="name">Contact Mode</field>
+            <field name="model">res.mode.contact</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Contact Mode">
+                    <field  name="name" select="1"/>
+                    <field  name="active"/>
+              </form>
+            </field>
+          </record>
+
+        <record model="ir.ui.view" id="tree_mode_p_contact">
+            <field name="name">Contact Mode</field>
+            <field name="model">res.mode.contact</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+             <tree string="Contact Mode">
+                    <field  name="name"/>
+                    <field  name="active"/>
+              </tree>
+            </field>
+          </record>
+
+        <record model="ir.actions.act_window" id="action_mode_p">
+            <field name="name">Contact Mode</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.mode.contact</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem name="Contact Mode" parent="base.menu_base_config" action="action_mode_p" id="menu_mode_po"/>
+
         <record model="ir.ui.view" id="view_partner_contact">
             <field name="name">view.partner.contact</field>
             <field name="model">res.partner</field>
@@ -730,17 +766,17 @@ invoiced
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string="Product">
-				   <group colspan="4" col="6">
+                <form string="Product">
+                   <group colspan="4" col="6">
                     <group colspan="4" col="2">
                         <separator string="Product Description" colspan="4"/>
                         <field name="name" select="1"  />
-                        <field groups="base.group_extended" name="variants" select="2" />
+                        <field groups="base.group_extended" name="variants" />
                     </group>
                     <group colspan="1" col="2">
                         <separator string="Codes" colspan="2"/>
                         <field name="default_code" select="1"/>
-                        <field groups="base.group_extended" name="ean13" select="2"/>
+                        <field groups="base.group_extended" name="ean13"/>
                     </group>
 
                    </group>
@@ -748,30 +784,30 @@ invoiced
                         <page string="Information">
                           <group colspan="2" col="2" name="Type">
                             <separator string="Product Type" colspan="2"/>
-	                          <field name="categ_id" select="1"/>
-	                          <field name="property_account_income" select="1" string="Account" required="1"/>
-	                          <field name="type" select="2"/>
-		                    </group>
-		                    <group colspan="2" col="2" name="Miscelleanous">
-		                      <separator string="Miscelleanous" colspan="2"/>
-	                      		<field name="income_pdt"/>
-	                      		<field name="expense_pdt"/>
+                              <field name="categ_id" select="1"/>
+                              <field name="property_account_income" select="1" string="Account" required="1"/>
+                              <field name="type"/>
+                            </group>
+                            <group colspan="2" col="2" name="Miscelleanous">
+                              <separator string="Miscelleanous" colspan="2"/>
+                                  <field name="income_pdt"/>
+                                  <field name="expense_pdt"/>
                             <field name="am_out"/>
                           <field name="disc_controle"/>
-	                      		<field name="company_id" select="2" groups="base.group_extended"/>
-	                      	</group>
-	                      	<group colspan="2" col="2" name="Prices">
-	                      		<separator string="Prices" colspan="2"/>
-		                      	<field name="lst_price"/>
-			                    <field name="standard_price"/>
-			                 </group>
+                                  <field name="company_id" groups="base.group_extended"/>
+                              </group>
+                              <group colspan="2" col="2" name="Prices">
+                                  <separator string="Prices" colspan="2"/>
+                                  <field name="lst_price"/>
+                                <field name="standard_price"/>
+                             </group>
                         </page>
                    </notebook>
                 </form>
             </field>
         </record>
 
-		<menuitem name="Configuration" parent="menu_point_root"
+        <menuitem name="Configuration" parent="menu_point_root"
             id="menu_point_config_product" sequence="6"/>
 
         <record model="ir.actions.act_window" id="action_product_input">
@@ -783,23 +819,23 @@ invoiced
             <field name="domain">[('income_pdt','=',True)]</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_product_input_tree_tag">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="product.product_product_tree_view"/>
-	        <field name="act_window_id" ref="action_product_input"/>
-	    </record>
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="product.product_product_tree_view"/>
+            <field name="act_window_id" ref="action_product_input"/>
+        </record>
         <record model="ir.actions.act_window.view" id="action_product_input_form_tag">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="product_input_output_form_view"/>
-	        <field name="act_window_id" ref="action_product_input"/>
-	    </record>
-		<menuitem name="Products for Input Operations"
-					parent="menu_point_config_product"
-					action="action_product_input"
-					id="products_for_input_operations"/>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="product_input_output_form_view"/>
+            <field name="act_window_id" ref="action_product_input"/>
+        </record>
+        <menuitem name="Products for Input Operations"
+                    parent="menu_point_config_product"
+                    action="action_product_input"
+                    id="products_for_input_operations"/>
 
-		<record model="ir.actions.act_window" id="action_product_output">
+        <record model="ir.actions.act_window" id="action_product_output">
             <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
@@ -808,21 +844,21 @@ invoiced
             <field name="domain">[('expense_pdt','=',True)]</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_product_output_tree_tag">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="product.product_product_tree_view"/>
-	        <field name="act_window_id" ref="action_product_output"/>
-	    </record>
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="product.product_product_tree_view"/>
+            <field name="act_window_id" ref="action_product_output"/>
+        </record>
         <record model="ir.actions.act_window.view" id="action_product_output_form_tag">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="product_input_output_form_view"/>
-	        <field name="act_window_id" ref="action_product_output"/>
-	    </record>
-		<menuitem name="Products for Output Operations"
-					parent="menu_point_config_product"
-					action="action_product_output"
-					id="products_for_output_operations"/>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="product_input_output_form_view"/>
+            <field name="act_window_id" ref="action_product_output"/>
+        </record>
+        <menuitem name="Products for Output Operations"
+                    parent="menu_point_config_product"
+                    action="action_product_output"
+                    id="products_for_output_operations"/>
 
 <!--        <wizard
             string="Refloat Box entries"
@@ -909,95 +945,94 @@ invoiced
 <!--        <menuitem name="Toutes les lignes de ventes" parent="menu_point_root" id="menu_pos_all_sales_lines" action="action_pos_all_sales_lines" sequence="5" />-->
 
         <!--  Miscelleanous Operations/Reporting -->
-		<menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="5"/>
-		<menuitem name="Registers" parent="menu_point_rep" id="menu_point_report_register" sequence="0" />
-		<menuitem name="Sales" parent="menu_point_rep" id="menu_point_report_sale" sequence="1" />
+        <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="5"/>
+        <menuitem name="Registers" parent="menu_point_rep" id="menu_point_report_register" sequence="0" />
+        <menuitem name="Sales" parent="menu_point_rep" id="menu_point_report_sale" sequence="1" />
 
-		<menuitem name="Details Of Operations" parent="menu_point_report_sale" id="menu_details_of_oper" sequence="1" groups="base.group_extended"/>
-		<menuitem name="All Sales" parent="menu_details_of_oper"
-						id="menu_action_all_sales_tree3" action="action_pos_order_tree3" sequence="1"  groups="base.group_extended"/>
-		<menuitem name="Sales of the day" parent="menu_action_all_sales_tree3"
-						id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
-		<menuitem name="Accepted Sales" parent="menu_action_all_sales_tree3"
-						id="menu_action_sale_of_day_accept" action="action_pos_order_accepted"/>
-<!--		<menuitem name="Open Sales" parent="menu_action_all_sales_tree3"
-						id="menu_action_open_sales_treeop" action="action_pos_order_tree_open"/-->
+        <menuitem name="Details Of Operations" parent="menu_point_report_sale" id="menu_details_of_oper" sequence="1" groups="base.group_extended"/>
+        <menuitem name="All Sales" parent="menu_details_of_oper"
+                        id="menu_action_all_sales_tree3" action="action_pos_order_tree3" sequence="1"  groups="base.group_extended"/>
+        <menuitem name="Sales of the day" parent="menu_action_all_sales_tree3"
+                        id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
+        <menuitem name="Accepted Sales" parent="menu_action_all_sales_tree3"
+                        id="menu_action_sale_of_day_accept" action="action_pos_order_accepted"/>
+<!--        <menuitem name="Open Sales" parent="menu_action_all_sales_tree3"
+                        id="menu_action_open_sales_treeop" action="action_pos_order_tree_open"/-->
 
-		<menuitem name="Sales Reports" parent="menu_point_report_sale" id="menu_sales_report" sequence="2"/>
+        <menuitem name="Sales Reports" parent="menu_point_report_sale" id="menu_sales_report" sequence="2"/>
 
         <menuitem name="Sales of the day" parent="menu_sales_report"
-        		action="action_trans_pos_tree_today" id="menu_trans_pos_tree_today"/>
+                action="action_trans_pos_tree_today" id="menu_trans_pos_tree_today"/>
 
-		<menuitem name="Sales of the month" parent="menu_sales_report"
-				action="action_trans_pos_tree_month" id="menu_trans_pos_tree_month"/>
+        <menuitem name="Sales of the month" parent="menu_sales_report"
+                action="action_trans_pos_tree_month" id="menu_trans_pos_tree_month"/>
 
-		<menuitem name="All the sales" parent="menu_sales_report"
-		 		action="action_trans_pos_tree" id="menu_trans_pos_tree"/>
+        <menuitem name="All the sales" parent="menu_sales_report"
+                 action="action_trans_pos_tree" id="menu_trans_pos_tree"/>
 
-		 <menuitem name="Sales by User" parent="menu_sales_report"
-		 		action="action_report_sales_by_user_pos_today" id="menu_report_sales_by_user_pos_tree"/>
+         <menuitem name="Sales by User" parent="menu_sales_report"
+                 action="action_report_sales_by_user_pos_today" id="menu_report_sales_by_user_pos_tree"/>
 
-		<menuitem name="Sales by User Monthly" parent="menu_sales_report"
-		 		action="action_report_sales_by_user_pos_month" id="menu_report_sales_by_user_pos_month_tree"/>
+        <menuitem name="Sales by User Monthly" parent="menu_sales_report"
+                 action="action_report_sales_by_user_pos_month" id="menu_report_sales_by_user_pos_month_tree"/>
 
-		 <menuitem name="Sales by User Daily Margin" parent="menu_sales_report"
-		 		action="action_report_sales_by_margin_pos_today" id="menu_report_sales_by_user_margin_daily_pos_tree"/>
+         <menuitem name="Sales by User Daily Margin" parent="menu_sales_report"
+                 action="action_report_sales_by_margin_pos_today" id="menu_report_sales_by_user_margin_daily_pos_tree"/>
 
-		<menuitem name="Sales by User Monthly Margin" parent="menu_sales_report"
-		 		action="action_report_sales_by_margin_pos_month" id="menu_report_sales_by_user_pos_month_margin_tree"/>
-		<!-- Invoice -->
+        <menuitem name="Sales by User Monthly Margin" parent="menu_sales_report"
+                 action="action_report_sales_by_margin_pos_month" id="menu_report_sales_by_user_pos_month_margin_tree"/>
+        <!-- Invoice -->
 
-		<record model="ir.actions.act_window" id="action_pos_invoice">
+        <record model="ir.actions.act_window" id="action_pos_invoice">
             <field name="name">Invoices</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-			<field name="domain">[('origin','like','POS')]</field>
+            <field name="domain">[('origin','like','POS')]</field>
         </record>
-		<menuitem name="All Invoices" parent="menu_details_of_oper"
-		 		action="action_pos_invoice" id="menu_pos_invoice_tree"/>
+        <menuitem name="All Invoices" parent="menu_details_of_oper"
+                 action="action_pos_invoice" id="menu_pos_invoice_tree"/>
 
-		<menuitem name="Payments and Sales" parent="menu_point_report_sale"
-		 		 id="menu_cashboxes_closing_tree" sequence="1"/>
-		<menuitem name="Today" parent="menu_cashboxes_closing_tree"
-		 		 id="menu_cashboxes_by_day" sequence="1"/>
+        <menuitem name="Payments and Sales" parent="menu_point_report_sale"
+                  id="menu_cashboxes_closing_tree" sequence="1"/>
+        <menuitem name="Today" parent="menu_cashboxes_closing_tree"
+                  id="menu_cashboxes_by_day" sequence="1"/>
 
-		<menuitem name="All Sales Lines" parent="menu_details_of_oper"
-						id="menu_action_pos_order_line" action="action_pos_order_line" sequence="2"/>
+        <menuitem name="All Sales Lines" parent="menu_details_of_oper"
+                        id="menu_action_pos_order_line" action="action_pos_order_line" sequence="2"/>
 
-		<menuitem name="Sales Lines of the day" parent="menu_action_pos_order_line"
-					id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
+        <menuitem name="Sales Lines of the day" parent="menu_action_pos_order_line"
+                    id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
 
-<!--		<menuitem name="Open Sales Line" parent="menu_action_pos_order_line"
-					id="menu_action_open_sales_line" action="action_pos_order_line_form"/-->
+<!--        <menuitem name="Open Sales Line" parent="menu_action_pos_order_line"
+                    id="menu_action_open_sales_line" action="action_pos_order_line_form"/-->
 
-<!--		<menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report"
-				id="menu_pos_payment_report" parent="menu_cashboxes_by_day" type="wizard" sequence="4"/-->
+<!--        <menuitem icon="STOCK_PRINT" action="wizard_pos_payment_report"
+                id="menu_pos_payment_report" parent="menu_cashboxes_by_day" type="wizard" sequence="4"/-->
 
-		<menuitem icon="STOCK_PRINT" action="action_report_pos_sale_user"
-				id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
+        <menuitem icon="STOCK_PRINT" action="action_report_pos_sale_user"
+                id="menu_pos_sales_user" parent="menu_trans_pos_tree" sequence="3" groups="base.group_extended" />
 
 
-		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
-				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
+        <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
+                id="menu_pos_payment_report_date" parent="menu_trans_pos_tree" sequence="5" groups="base.group_extended"/>
  
-		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
-				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
-		<menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
-				id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" sequence="2" groups="base.group_extended"/>
+        <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
+                id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
+        <menuitem icon="STOCK_PRINT" action="action_pos_sales_user_today"
+                id="menu_pos_sales_user_today" parent="menu_trans_pos_tree_today" sequence="2" groups="base.group_extended"/>
 
-		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
-				id="menu_pos_payment_report_date" parent="menu_trans_pos_tree"  sequence="5" groups="base.group_extended"/>
+        <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_repport_date"
+                id="menu_pos_payment_report_date" parent="menu_trans_pos_tree"  sequence="5" groups="base.group_extended"/>
 
-		<menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
-				id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
-		<menuitem icon="STOCK_PRINT" action="action_report_pos_sales_user_today_current_user"
-				id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day"  sequence="7"/>
+        <menuitem icon="STOCK_PRINT" action="action_report_pos_payment_report_user"
+                id="menu_pos_payment_report_user" parent="menu_trans_pos_tree_today" sequence="6" groups="base.group_extended"/>
+        <menuitem icon="STOCK_PRINT" action="action_report_pos_sales_user_today_current_user"
+                id="menu_pos_sales_user_today_current_user" parent="menu_cashboxes_by_day"  sequence="7"/>
 
-    	
-    	<menuitem icon="STOCK_PRINT" action="action_report_pos_details"
-				id="menu_pos_details" parent="menu_cashboxes_by_day"  />
+        <menuitem icon="STOCK_PRINT" action="action_report_pos_details"
+                id="menu_pos_details" parent="menu_cashboxes_by_day"  />
 
 
     </data>
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index d9f345ca185..ee905ed74bf 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -33,7 +33,7 @@ class pos_invoice(report_sxw.rml_parse):
         self.localcontext.update({
             'time': time,
         })
-        print
+        
 
     def set_context(self, objects, data, ids, report_type=None):
         super(pos_invoice, self).set_context(objects, data, ids, report_type)
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
index f27add1e208..ceb824cf014 100644
--- a/addons/point_of_sale/report/pos_payment_report.py
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -52,7 +52,7 @@ class pos_payment_report(report_sxw.rml_parse):
                                  "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
                                  "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date")
             data=self.cr.dictfetchall()
-        print data
+        
         for d in data:
             self.total += d['price_unit'] * d['qty']
         return data
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 32f6557c213..80b2b1ec756 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -102,7 +102,7 @@
                         </page>
                     </notebook>
                     <group col="7" colspan="4">
-                        <field name="state" select="2" colspan="4"/>
+                        <field name="state" colspan="4"/>
                         <field name="total_entry_encoding"/>
                         </group>
                         <group colspan="4">
@@ -165,7 +165,7 @@
                         </page>
                     </notebook>
                     <group col="7" colspan="4">
-                        <field name="state" select="2" colspan="4"/>
+                        <field name="state" colspan="4"/>
                         <field name="total_entry_encoding"/>
                         </group>
                         <group colspan="4">
@@ -294,7 +294,7 @@
                     </page>
                     </notebook>
                     <group col="7" colspan="4">
-                        <field name="state" select="2" colspan="4"/>
+                        <field name="state" colspan="4"/>
                         <field name="total_entry_encoding"/>
                       </group>
                       <group colspan="4">
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index c34e7fad9e1..8e25f3f0797 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -137,17 +137,21 @@ class pos_make_payment(osv.osv_memory):
                 jrnl_used=jrnl_obj.browse(cr,uid,data['journal'])
             order_obj.write(cr, uid, [record_id], {'invoice_wanted': invoice_wanted})
             order_obj.add_payment(cr, uid, record_id, data, context=context)            
-        
-        if amount<=0.0:
-            context.update({'flag':True})
-            order_obj.action_paid(cr,uid,[record_id],context)
+        # Todo need to check
+#        if amount<=0.0:
+#            context.update({'flag':True})
+#            order_obj.action_paid(cr,uid,[record_id],context)
         if order_obj.test_paid(cr, uid, [record_id]):
             if order.partner_id and order.invoice_wanted:
                 return self.create_invoice(cr,uid,ids,context)
             else:
+                order_obj.action_paid(cr,uid,[record_id],context)                
                 order_obj.write(cr, uid, [record_id],{'state':'paid'})                            
                 return self.print_report(cr, uid, ids, context)  
         if order.amount_paid > 0.0:
+            context.update({'flag': True})
+            # Todo need to check
+            order_obj.action_paid(cr, uid, [record_id], context)            
             self.pool.get('pos.order').write(cr, uid, [record_id],{'state':'advance'})
             return self.print_report(cr, uid, ids, context)            
         return {}
diff --git a/addons/process/__terp__.py b/addons/process/__openerp__.py
similarity index 100%
rename from addons/process/__terp__.py
rename to addons/process/__openerp__.py
diff --git a/addons/process/i18n/ar.po b/addons/process/i18n/ar.po
index 1aa8de6b2c2..e245919123b 100644
--- a/addons/process/i18n/ar.po
+++ b/addons/process/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/bg.po b/addons/process/i18n/bg.po
index a3a24aa135e..edd174e30de 100644
--- a/addons/process/i18n/bg.po
+++ b/addons/process/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/bs.po b/addons/process/i18n/bs.po
index ed49c5c2f0d..23ebe1aabec 100644
--- a/addons/process/i18n/bs.po
+++ b/addons/process/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/ca.po b/addons/process/i18n/ca.po
index 21c81594916..b6cd20349e2 100644
--- a/addons/process/i18n/ca.po
+++ b/addons/process/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/cs.po b/addons/process/i18n/cs.po
index 6f6bfc03516..51195780e43 100644
--- a/addons/process/i18n/cs.po
+++ b/addons/process/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/de.po b/addons/process/i18n/de.po
index 3f81d1e78bc..319e8d1c06b 100644
--- a/addons/process/i18n/de.po
+++ b/addons/process/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/el.po b/addons/process/i18n/el.po
index 3520bc8a608..45394407977 100644
--- a/addons/process/i18n/el.po
+++ b/addons/process/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index 25b6dda24f9..1b5c69d8161 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/es_AR.po b/addons/process/i18n/es_AR.po
index b4c6919283a..b78b1def4d3 100644
--- a/addons/process/i18n/es_AR.po
+++ b/addons/process/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/et.po b/addons/process/i18n/et.po
index e4c378c9d5e..2c42dfcef69 100644
--- a/addons/process/i18n/et.po
+++ b/addons/process/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/fi.po b/addons/process/i18n/fi.po
index 5aac4c095b8..0e505bd2102 100644
--- a/addons/process/i18n/fi.po
+++ b/addons/process/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/fr.po b/addons/process/i18n/fr.po
index c6d87668b19..80659b1c30f 100644
--- a/addons/process/i18n/fr.po
+++ b/addons/process/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/hi.po b/addons/process/i18n/hi.po
index 5a80f2f2c18..28b03ec8dd6 100644
--- a/addons/process/i18n/hi.po
+++ b/addons/process/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index c2a3779243a..1c615bec606 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/process/i18n/hu.po b/addons/process/i18n/hu.po
index 6f6bfc03516..51195780e43 100644
--- a/addons/process/i18n/hu.po
+++ b/addons/process/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/id.po b/addons/process/i18n/id.po
index d4fe4ac85f4..64f98c82daf 100644
--- a/addons/process/i18n/id.po
+++ b/addons/process/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/it.po b/addons/process/i18n/it.po
index 4a650d994e9..c3ee749b370 100644
--- a/addons/process/i18n/it.po
+++ b/addons/process/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/ko.po b/addons/process/i18n/ko.po
index 47020298722..a9d4ca39e22 100644
--- a/addons/process/i18n/ko.po
+++ b/addons/process/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/lt.po b/addons/process/i18n/lt.po
index 1b4fb507ea1..58b5e6c1f43 100644
--- a/addons/process/i18n/lt.po
+++ b/addons/process/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/nl.po b/addons/process/i18n/nl.po
index 85594095f03..5584ae85aec 100644
--- a/addons/process/i18n/nl.po
+++ b/addons/process/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/nl_BE.po b/addons/process/i18n/nl_BE.po
index 61d27ba9be9..967ec595111 100644
--- a/addons/process/i18n/nl_BE.po
+++ b/addons/process/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/pl.po b/addons/process/i18n/pl.po
index 7afd90bc7ab..be8d4cecd3b 100644
--- a/addons/process/i18n/pl.po
+++ b/addons/process/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/pt.po b/addons/process/i18n/pt.po
index 173e825136c..12b3d10c16d 100644
--- a/addons/process/i18n/pt.po
+++ b/addons/process/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/pt_BR.po b/addons/process/i18n/pt_BR.po
index 3b0cb83b3d8..bb50885cc29 100644
--- a/addons/process/i18n/pt_BR.po
+++ b/addons/process/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/ro.po b/addons/process/i18n/ro.po
index fdbabf20a1f..b3f845461f1 100644
--- a/addons/process/i18n/ro.po
+++ b/addons/process/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/ru.po b/addons/process/i18n/ru.po
index e285b93a5f3..d14ede79e49 100644
--- a/addons/process/i18n/ru.po
+++ b/addons/process/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/sl.po b/addons/process/i18n/sl.po
index 7329d4cfa65..44036d6a438 100644
--- a/addons/process/i18n/sl.po
+++ b/addons/process/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/sr.po b/addons/process/i18n/sr.po
index 9deceb517f9..e62ab600a89 100644
--- a/addons/process/i18n/sr.po
+++ b/addons/process/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/sv.po b/addons/process/i18n/sv.po
index 16e2d5ff0ba..0d7ca44ce87 100644
--- a/addons/process/i18n/sv.po
+++ b/addons/process/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/tlh.po b/addons/process/i18n/tlh.po
index 76717d7c4b5..98daa6d91b0 100644
--- a/addons/process/i18n/tlh.po
+++ b/addons/process/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index eaf18b536f6..e8f0674284d 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/uk.po b/addons/process/i18n/uk.po
index f9b50f11d20..049991044d2 100644
--- a/addons/process/i18n/uk.po
+++ b/addons/process/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index 3eca5c3ce55..b8f6c48faab 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/zh_TW.po b/addons/process/i18n/zh_TW.po
index 1aa8de6b2c2..e245919123b 100644
--- a/addons/process/i18n/zh_TW.po
+++ b/addons/process/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 45f3cac0c3d..5784a92ff20 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -16,7 +16,7 @@
             <form string="Process">
                 <group colspan="4" string="Details">
                     <field name="name" select="1"/>
-                    <field name="active" select="2"/>
+                    <field name="active"/>
                     <field name="model_id" select="1"/>
                 </group>
                 <notebook colspan="4">
@@ -35,7 +35,7 @@
                                     <field name="process_id" readonly="1" required="0"/> <!-- used by transition_out -->
                                     <newline/>
                                     <field name="model_id" select="1"/>
-                                    <field name="menu_id" select="2"/>                                    
+                                    <field name="menu_id"/>
                                     <newline/>
                                     <field name="kind" select="1"/>
                                     <field name="help_url" widget="url"/>
@@ -68,7 +68,7 @@
                                                                 <newline/>
                                                                 <field name="state"/>
                                                                 <field name="action"/>
-                                                            </form>               
+                                                            </form>
                                                         </field>
                                                     </page>
                                                     <page string="Roles Required">
@@ -145,8 +145,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Process Nodes">
-                <field name="name"/>      
-                <field name="process_id" select="1"/>          
+                <field name="name"/>
+                <field name="process_id" select="1"/>
                 <field name="model_id" select="1"/>
                 <field name="kind" select="1"/>
                 <field name="flow_start"/>
@@ -162,11 +162,11 @@
             <form string="Process Node">
                 <group colspan="4" string="Details">
                     <field name="name" select="1"/>
-                    <field name="flow_start"/>                                    
+                    <field name="flow_start"/>
                     <field name="process_id"/>
-                    <newline/>                                    
+                    <newline/>
                     <field name="model_id" select="1"/>
-                    <field name="menu_id" select="2"/>                                    
+                    <field name="menu_id"/>
                     <newline/>
                     <field name="kind" select="1"/>
                     <field name="help_url" widget="url"/>
@@ -199,7 +199,7 @@
                                                 <newline/>
                                                 <field name="state"/>
                                                 <field name="action"/>
-                                            </form>               
+                                            </form>
                                         </field>
                                     </page>
                                     <page string="Roles Required">
@@ -234,7 +234,7 @@
                         <field name="note" nolabel="1" colspan="4"/>
                     </page>
                 </notebook>
-            </form>                                
+            </form>
         </field>
     </record>
 
diff --git a/addons/product/__terp__.py b/addons/product/__openerp__.py
similarity index 100%
rename from addons/product/__terp__.py
rename to addons/product/__openerp__.py
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index eaccdca6bbb..81269759019 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index 8985d92dba3..895420b0c92 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index 9b4bb51cbdb..7df8724e599 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index 7ff6a6a508e..45391b59b8c 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index 27ed7231bd5..3194657ee9a 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 002d81eb277..cd6747ce36d 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index bdd7ad411a1..8bf386059a2 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 579f639f154..6cda2845582 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index 64384d70c0f..f31c3a3ec55 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index b3ad90387c6..a7ab1ca5d5d 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index 86cd602e93e..92346a6eeb3 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index b7d7e8f505d..0bbce3e645b 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index 61e7bbc6c5a..2522e0e9918 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index f1bae0481c9..ddea0e6c70f 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 3d4cd3e7617..bd46f0f2323 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 908147e0a58..1d298587478 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-10 13:51+0000\n"
+"PO-Revision-Date: 2010-04-20 09:57+0000\n"
 "Last-Translator: Carlo Vettore <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-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -458,7 +458,7 @@ msgstr "Margine Minimo"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "* ( 1 + "
-msgstr "* ( 1 + "
+msgstr "( 1 - "
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index e5984ec230f..2440813773d 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 885f1cbcb93..7ec543eb23d 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index 0bfc9fa0ddb..df9c47aa56e 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 2bee909db7e..81b86431a4e 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index 4d3a6459d1a..be78e242f17 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index 95fed43a9da..f7ae432bd0e 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index a2c755a1d43..afbf0fd1f13 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+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 5233d991484..32dc58973a2 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index 2ec7a6ad0a9..1745a31a913 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 075e7e1678b..e84ff7645ae 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-24 10:54+0000\n"
-"Last-Translator: Auduf <5097@mail.ru>\n"
+"PO-Revision-Date: 2010-04-13 05:28+0000\n"
+"Last-Translator: grisha <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-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -44,6 +44,7 @@ msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
 msgstr ""
+"Должно ли изделие быть видимым при выборе из списка изделий в форме заказа"
 
 #. module: product
 #: help:product.supplierinfo,name:0
@@ -123,7 +124,7 @@ msgstr ""
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr ""
+msgstr "Связанные поля в форме изделия"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -143,12 +144,12 @@ msgstr "Каталог продукции"
 #. module: product
 #: model:product.category,name:product.cat1
 msgid "Sellable"
-msgstr ""
+msgstr "Для продажи"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Kit Keyboard + Mouse"
-msgstr ""
+msgstr "Комплект мыши и клавиатуры"
 
 #. module: product
 #: field:product.price.type,name:0
@@ -168,7 +169,7 @@ msgstr "Компания"
 #. module: product
 #: field:product.template,rental:0
 msgid "Rentable Product"
-msgstr ""
+msgstr "Изделие для аренды"
 
 #. module: product
 #: field:product.product,lst_price:0
@@ -197,6 +198,7 @@ msgid ""
 "Base price for computing the customer price. Sometimes called the catalog "
 "price."
 msgstr ""
+"Базовая цена для расчёта цены продажи. Иногда называется справочой ценой."
 
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
@@ -211,12 +213,12 @@ msgstr "Процессор AMD Athlon XP 2200+"
 #. module: product
 #: help:product.price.type,name:0
 msgid "Name of this kind of price."
-msgstr ""
+msgstr "Наименование типа цены"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr ""
+msgstr "Каталог действителен, начиная с даты"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -265,7 +267,7 @@ msgstr "Каталог продаж"
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
 msgid "If Other Pricelist"
-msgstr ""
+msgstr "В другом каталоге"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -283,6 +285,10 @@ msgid ""
 "Rounding is applied after the discount and before the surcharge.\n"
 "To have prices that end in 9.99, set rounding 10, surcharge -0.01"
 msgstr ""
+"Устанавливает цену кратной данному значению.\n"
+"Округление применяется после скидки, но  перед надбавкой.\n"
+"Так, чтобы цена заканчивалась на 9,99, установите округление 10, надбавку -"
+"0,01."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -328,7 +334,7 @@ msgstr "Базовае цены"
 #. module: product
 #: model:ir.ui.menu,name:product.menu_price
 msgid "Prices Computations"
-msgstr ""
+msgstr "Вычисление цен"
 
 #. module: product
 #: field:product.pricelist.item,name:0
@@ -353,7 +359,7 @@ msgstr "Ошибка ! Невозможно создать рекурсивну
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default UoM"
-msgstr ""
+msgstr "Единица измерения по умолчанию"
 
 #. module: product
 #: field:product.template,produce_delay:0
@@ -516,7 +522,7 @@ msgstr "Каталоги"
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Partner Product Name"
-msgstr ""
+msgstr "Наименование изделия партнёра"
 
 #. module: product
 #: view:product.product:0
@@ -563,7 +569,7 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr ""
+msgstr "Время поставки"
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -608,7 +614,7 @@ msgstr "Расходные"
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr ""
+msgstr "Валюта"
 
 #. module: product
 #: help:product.template,weight:0
@@ -725,7 +731,7 @@ msgstr "Стеллаж"
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr ""
+msgstr "Категория единиц измерения"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -817,7 +823,7 @@ msgstr "Валюта"
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr ""
+msgstr "Типовая конфигурация процессора"
 
 #. module: product
 #: view:product.product:0
@@ -828,7 +834,7 @@ msgstr "Описания"
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Suppliers of Product"
-msgstr ""
+msgstr "Поставщики изделия"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -838,7 +844,7 @@ msgstr "Дата начала"
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Свойства продажи"
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -846,6 +852,8 @@ msgid ""
 "Current quantities of products in selected locations or all internal if none "
 "have been selected."
 msgstr ""
+"Текуще количество продукции в выбранных складах или общее количество, если "
+"ничего не выбрано."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
@@ -891,6 +899,8 @@ msgid ""
 "Unit of Measure of a category can be converted between each others in the "
 "same category."
 msgstr ""
+"Единицы измерения могут быть приведены друг к другу в пределах одной "
+"категории."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
@@ -905,7 +915,7 @@ msgstr "Можно продавать"
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Complete PC With Peripherals"
-msgstr ""
+msgstr "Комплектовать ПК периферией"
 
 #. module: product
 #: constraint:product.template:0
@@ -994,7 +1004,7 @@ msgstr ""
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
 msgid "Max. Price Margin"
-msgstr ""
+msgstr "Максимальная маржа цены"
 
 #. module: product
 #: view:res.partner:0
@@ -1113,12 +1123,12 @@ msgstr "Длина пакета"
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
 msgid "Min. Price Margin"
-msgstr ""
+msgstr "Минимальная маржа цены"
 
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "Штрих-код EAN упаковки"
 
 #. module: product
 #: field:product.template,weight:0
@@ -1233,7 +1243,7 @@ msgstr ""
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Ending date for this pricelist version to be valid."
-msgstr ""
+msgstr "Конечная дата, до которой каталог действителен"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
@@ -1303,7 +1313,7 @@ msgstr "Жесткий диск Seagate 7200.8 120GB"
 #. module: product
 #: wizard_field:product.price_list,init,qty2:0
 msgid "Quantity-2"
-msgstr ""
+msgstr "Количество-2"
 
 #. module: product
 #: view:product.product:0
@@ -1327,12 +1337,12 @@ msgstr ""
 #. module: product
 #: wizard_field:product.price_list,init,qty4:0
 msgid "Quantity-4"
-msgstr ""
+msgstr "Количество-4"
 
 #. module: product
 #: wizard_field:product.price_list,init,qty5:0
 msgid "Quantity-5"
-msgstr ""
+msgstr "Количество-5"
 
 #. module: product
 #: view:product.packaging:0
@@ -1394,7 +1404,7 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Product suppliers, with their product name, price, etc."
-msgstr ""
+msgstr "Поставщики изделия, с названиями и ценами"
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -1449,6 +1459,8 @@ msgid ""
 "the delivery of the finished products. It's the time you promise to your "
 "customers."
 msgstr ""
+"Среднее время между подтверждением заказа и доставкой товара. Это время вы "
+"сообщаете заказчикам."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -1458,7 +1470,7 @@ msgstr "Категория ед. изм. продукции"
 #. module: product
 #: wizard_field:product.price_list,init,qty3:0
 msgid "Quantity-3"
-msgstr ""
+msgstr "Количество-3"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -1595,7 +1607,7 @@ msgstr "Конец жизненного цикла"
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
 msgid "Products & Pricelists"
-msgstr ""
+msgstr "Изделия и каталоги"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1648,7 +1660,7 @@ msgstr ""
 #. module: product
 #: wizard_field:product.price_list,init,qty1:0
 msgid "Quantity-1"
-msgstr ""
+msgstr "Количество-1"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1667,6 +1679,8 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
+"Задержка в днях между подтверждением заказа и поступлением изделия на склад. "
+"Используется планировщиком для автоматического планирования заказов."
 
 #. module: product
 #: help:product.template,uom_po_id:0
@@ -1695,12 +1709,12 @@ msgstr ""
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
 msgid "Products Labels"
-msgstr ""
+msgstr "Этикетки изделия"
 
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
-msgstr ""
+msgstr "Объём в метрах куб."
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 0ebcffd1993..4f08ec56db4 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index 71cc242638e..3367dbd9aea 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+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 09456fdc6f8..abdb97161c8 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index e9a6feee054..27709fb31c0 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index 0704dd19925..0c59197fdbd 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+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 1b3f1750dd2..bb924db644c 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index 39e8854a4f5..3b13fdc7e88 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 23c0fd0dcaa..c6b06e8b29d 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+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 d22434673c5..a3bbdc4b49e 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index f9bb54d08fd..01d758d9977 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index d16034b4e3b..0d4685593c3 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -14,7 +14,7 @@
             <field name="arch" type="xml">
                 <form string="Pricelist Version">
                     <field name="name" select="1"/>
-                    <field name="active" select="2"/>
+                    <field name="active"/>
                     <field colspan="4" name="pricelist_id" select="1"/>
                     <field name="date_start" select="1"/>
                     <field name="date_end" select="1"/>
@@ -44,7 +44,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_pricelist_version_tree_view"/>
         </record>
-        <menuitem action="product_pricelist_action" id="menu_product_pricelist_action" parent="product.menu_product_pricelist_main" sequence="2"/>
+        <menuitem
+            action="product_pricelist_action" id="menu_product_pricelist_action" 
+            parent="product.menu_product_pricelist_main" sequence="2"/>
 
         <record id="product_pricelist_item_tree_view" model="ir.ui.view">
             <field name="name">product.pricelist.item.tree</field>
@@ -125,7 +127,7 @@
                     <field colspan="4" name="version_id" nolabel="1">
                         <form string="Pricelist Version">
                             <field name="name" select="1"/>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <field name="date_start" select="1"/>
                             <field name="date_end" select="1"/>
                             <field colspan="4" name="items_id" nolabel="1" widget="one2many_list"/>
@@ -147,7 +149,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="product_pricelist_action2" id="menu_product_pricelist_action2" parent="product.menu_product_pricelist_main" sequence="1"/>
+        <menuitem
+            action="product_pricelist_action2" id="menu_product_pricelist_action2"
+            parent="product.menu_product_pricelist_main" sequence="1"/>
 
         <record id="product_price_type_view" model="ir.ui.view">
             <field name="name">product.price.type.form</field>
@@ -169,9 +173,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-<!--        <menuitem name="Prices Computations" id="menu_price" parent="product.menu_config_product"/>-->
-<!--        <menuitem action="product_price_type_action" groups="base.group_extended" id="menu_product_price_type_action" parent="menu_price"/>-->
-
         <record id="product_pricelist_type_view" model="ir.ui.view">
             <field name="name">product.pricelist.type.form</field>
             <field name="model">product.pricelist.type</field>
@@ -190,7 +191,5 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-<!--        <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="menu_price"/>-->
-
     </data>
 </openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index 72fcfa5afd2..b21ebe5ee3a 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -256,11 +256,11 @@ class product_template(osv.osv):
         'description': fields.text('Description',translate=True),
         'description_purchase': fields.text('Purchase Description',translate=True),
         'description_sale': fields.text('Sale Description',translate=True),
-        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way requisitions are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."),
+        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."),
         'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Purchase will trigger purchase orders when requested."),
         'sale_delay': fields.float('Customer Lead Time', help="This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
-        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Requisition Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the requisition request."),
+        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]"),
         'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
@@ -271,7 +271,7 @@ class product_template(osv.osv):
         'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
             help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
         'warranty': fields.float('Warranty (months)'),
-        'sale_ok': fields.boolean('Can be sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
+        'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
         'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
         'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."),
         'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."),
@@ -648,7 +648,7 @@ class product_supplierinfo(osv.osv):
         'name' : fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', help="Supplier of this product"),
         'product_name': fields.char('Partner Product Name', size=128, help="This partner's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
         'product_code': fields.char('Partner Product Code', size=64, help="This partner's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
-        'sequence' : fields.integer('Priority', help="Assigns the priority to the list of product supplier."),
+        'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
         'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
         'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a01649850c7..b9858e19eaf 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -42,7 +42,7 @@
                 <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
                     <field name="default_code"/>
                     <field name="name"/>
-                    <field name="categ_id" />
+                    <field name="categ_id" invisible="1"/>
                     <field name="variants" groups="product.group_product_variant"/>
                     <field name="uom_id"/>
                     <field name="type"/>
@@ -66,26 +66,26 @@
                     <group colspan="4" col="2">
                         <separator string="Product Description" colspan="4"/>
                         <field name="name" select="1"  />
-                        <field groups="product.group_product_variant" name="variants" select="2" />
+                        <field groups="product.group_product_variant" name="variants" />
                     </group>
                     <group colspan="1" col="2">
                         <separator string="Codes" colspan="2"/>
                         <field name="default_code" select="1"/>
-                        <field groups="base.group_extended" name="ean13" select="2"/>
+                        <field name="ean13" groups="base.group_extended"/>
                     </group>
                     <group colspan="1" col="2">
                         <separator string="Product Characteristics" colspan="2"/>
-                        <field name="sale_ok" select="2"/>
-                        <field name="purchase_ok" select="2"/>
-                        <field groups="base.group_extended" name="rental" select="2"/>
+                        <field name="sale_ok"/>
+                        <field name="purchase_ok"/>
+                        <field groups="base.group_extended" name="rental"/>
                     </group>
                    </group>
 
                     <notebook colspan="4">
                         <page string="Information">
                             <group colspan="2" col="2">
-                                <separator string="    Requisition" colspan="2"/>
-                                <field name="type" select="2"/>
+                                <separator string="Procurement" colspan="2"/>
+                                <field name="type"/>
                                 <field name="procure_method"/>
                                 <field name="supply_method"/>
                             </group>
@@ -100,14 +100,14 @@
                             <group colspan="2" col="2" name="status">
                                 <separator string="Status" colspan="2"/>
                                 <field name="categ_id" select="1"/>
-                                <field name="state" select="2"/>
-                                <field groups="base.group_extended" name="product_manager" select="2"/>
+                                <field name="state"/>
+                                <field groups="base.group_extended" name="product_manager"/>
                             </group>
 
                             <group colspan="2" col="2" name="uom">
                                 <separator string="UOM" colspan="2"/>
-                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                <field name="uom_po_id"/>
+                                <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" widget="selection"/>
+                                <field name="uom_po_id" widget="selection"/>
                             </group>
 
                             <group colspan="2" col="2" name="uos" groups="product.group_uos">
@@ -118,7 +118,7 @@
                             </group>
 
                         </page>
-                        <page string="Requisition &amp; Locations">
+                        <page string="Procurement &amp; Locations">
                             <group colspan="2" col="2" name="delay">
                                 <separator string="Delays" colspan="2"/>
                                 <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@@ -132,10 +132,10 @@
                                 <field name="loc_case"/>
                             </group>
 
-                            <group colspan="2" col="2" name="misc">
+                            <group colspan="2" col="2" name="misc" groups="base.group_extended">
                                 <separator string="Miscellaneous" colspan="2"/>
-                                <field name="active" select="2"/>
-                                <field name="company_id" select="2" groups="base.group_multi_company" widget="selection"/>
+                                <field name="active"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
 
                         </page>
@@ -144,8 +144,8 @@
                             <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                             <field name="list_price"/>
                             <newline/>
-                            <field name="price_margin" select="1"/>
-                            <field name="price_extra" select="1"/>
+                            <field name="price_margin" groups="base.group_extended"/>
+                            <field name="price_extra" groups="base.group_extended"/>
                             <newline/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
@@ -163,7 +163,7 @@
                             <field colspan="4" name="packaging" nolabel="1">
                                 <form string="Packaging">
                                     <field name="ean" select="1"/>
-                                    <field name="sequence"/>
+                                    <field name="sequence" invisible="1"/>
                                     <newline/>
                                     <field name="qty" select="1"/>
                                     <field name="ul"/>
@@ -196,7 +196,6 @@
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
         <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
-<!--        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/>-->
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
             <field name="name">Products</field>
@@ -216,7 +215,7 @@
                 <form string="Product Categories">
                     <field name="name" select="1"/>
                     <field name="parent_id"/>
-                    <field name="sequence"/>
+                    <field name="sequence" invisible="1"/>
                     <field name="type"/>
                     <newline/>
                 </form>
@@ -252,8 +251,6 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="product_category_tree_view"/>
         </record>
-<!--        <menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="3"/>-->
-
         <record id="product_category_action_form" model="ir.actions.act_window">
             <field name="name">Products Categories</field>
             <field name="type">ir.actions.act_window</field>
@@ -261,8 +258,10 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_category_list_view"/>
         </record>
-<!--        <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/>-->
-        <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="prod_config_main" sequence="60"/>
+        <menuitem action="product_category_action_form"
+            groups="base.group_extended"
+            id="menu_product_category_action_form"
+            parent="prod_config_main" sequence="60"/>
 
 
         <record id="product_normal_action_tree" model="ir.actions.act_window">
@@ -375,8 +374,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-<!--        <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product" sequence="4"/>-->
-        <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="65"/>
+        <menuitem
+            action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="65"/>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
@@ -384,7 +383,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Packaging">
-                    <field name="sequence"/>
+                    <field name="sequence" invisible="1"/>
                     <field name="ean"/>
                     <field name="qty"/>
                     <field name="ul"/>
@@ -401,7 +400,7 @@
                     <field name="product_id" select="1"/>
                     <newline/>
                     <field name="ean" select="1"/>
-                    <field name="sequence"/>
+                    <field name="sequence" invisible="1"/>
                     <newline/>
                     <field name="qty" select="1"/>
                     <field name="ul"/>
@@ -427,9 +426,9 @@
             <field name="arch" type="xml">
                 <form string="Supplier Information">
                     <field name="name"/>
-                    <field name="sequence"/>
-                    <field name="product_name"/>
-                    <field name="product_code"/>
+                    <field name="sequence" invisible="1"/>
+                    <field name="product_name" groups="base.group_extended"/>
+                    <field name="product_code" groups="base.group_extended"/>
                     <field name="delay"/>
                     <field name="qty"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -452,11 +451,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Supplier Information">
-                    <field name="sequence" string="Seq"/>
+                    <field name="sequence" string="Seq" invisible="1"/>
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="qty"/>
-                    <field name="product_code"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
             </field>
@@ -521,15 +519,15 @@
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Product Type" colspan="2"/>
-                        <field name="sale_ok" select="2"/>
-                        <field name="purchase_ok" select="2"/>
-                        <field groups="base.group_extended" name="rental" select="2"/>
+                        <field name="sale_ok"/>
+                        <field name="purchase_ok"/>
+                        <field groups="base.group_extended" name="rental"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Information">
                             <group colspan="2" col="2">
-                                <separator string="Requisition" colspan="2"/>
-                                <field name="type" select="2"/>
+                                <separator string="Procurement" colspan="2"/>
+                                <field name="type"/>
                                 <field name="procure_method"/>
                                 <field name="supply_method"/>
                             </group>
@@ -544,8 +542,8 @@
                             <group colspan="2" col="2" name="status">
                                 <separator string="Status" colspan="2"/>
                                 <field name="categ_id" select="1"/>
-                                <field name="state" select="2"/>
-                                <field groups="base.group_extended" name="product_manager" select="2"/>
+                                <field name="state"/>
+                                <field groups="base.group_extended" name="product_manager"/>
                             </group>
 
                             <group colspan="2" col="2" name="uom">
@@ -562,7 +560,7 @@
                             </group>
 
                         </page>
-                        <page string="Requisition &amp; Locations">
+                        <page string="Procurement &amp; Locations" groups="base.group_extended">
                             <group colspan="2" col="2" name="delay">
                                 <separator string="Delays" colspan="2"/>
                                 <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@@ -575,7 +573,6 @@
                                 <field name="loc_row"/>
                                 <field name="loc_case"/>
                             </group>
-
                             <group colspan="2" col="2" name="misc">
                                 <separator string="Miscelleanous" colspan="2"/>
                             </group>
diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl
index 81d317c0fb7..85655ff4e6a 100644
--- a/addons/product/report/product_label.xsl
+++ b/addons/product/report/product_label.xsl
@@ -70,6 +70,7 @@
 				</td>
 			</tr><tr>
 				<td>
+				<barCode><xsl:value-of select="code"/></barCode>
 				</td><td>
 					<para style="nospace"><xsl:value-of select="product"/></para><xsl:text>, </xsl:text>
 					<para style="nospace"><xsl:value-of select="variant"/></para>
diff --git a/addons/product_margin/__terp__.py b/addons/product_margin/__openerp__.py
similarity index 100%
rename from addons/product_margin/__terp__.py
rename to addons/product_margin/__openerp__.py
diff --git a/addons/product_margin/i18n/ar.po b/addons/product_margin/i18n/ar.po
index 561c3b1aae4..926bd0bbf1e 100644
--- a/addons/product_margin/i18n/ar.po
+++ b/addons/product_margin/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/bg.po b/addons/product_margin/i18n/bg.po
index bd6c4e424dc..ea940d7b2d6 100644
--- a/addons/product_margin/i18n/bg.po
+++ b/addons/product_margin/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/bs.po b/addons/product_margin/i18n/bs.po
index af1e64a7f11..cbcda65fc7e 100644
--- a/addons/product_margin/i18n/bs.po
+++ b/addons/product_margin/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/ca.po b/addons/product_margin/i18n/ca.po
index e530b73759d..733524fff02 100644
--- a/addons/product_margin/i18n/ca.po
+++ b/addons/product_margin/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/cs.po b/addons/product_margin/i18n/cs.po
index daff401f7a2..9dd8bc078e9 100644
--- a/addons/product_margin/i18n/cs.po
+++ b/addons/product_margin/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/de.po b/addons/product_margin/i18n/de.po
index 87634f5922c..a3731e7e469 100644
--- a/addons/product_margin/i18n/de.po
+++ b/addons/product_margin/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/el.po b/addons/product_margin/i18n/el.po
index 170d1b0bf53..b580ec503f3 100644
--- a/addons/product_margin/i18n/el.po
+++ b/addons/product_margin/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index ce04338d710..1e2a062760a 100644
--- a/addons/product_margin/i18n/es.po
+++ b/addons/product_margin/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/es_AR.po b/addons/product_margin/i18n/es_AR.po
index f1bbc4affb3..a4bb673f2ff 100644
--- a/addons/product_margin/i18n/es_AR.po
+++ b/addons/product_margin/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/et.po b/addons/product_margin/i18n/et.po
index 5eb675ebf09..73ba427fd83 100644
--- a/addons/product_margin/i18n/et.po
+++ b/addons/product_margin/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/fi.po b/addons/product_margin/i18n/fi.po
index 0ce193ec256..855e6a2ee39 100644
--- a/addons/product_margin/i18n/fi.po
+++ b/addons/product_margin/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/fr.po b/addons/product_margin/i18n/fr.po
index 720405eb9fa..96917669bff 100644
--- a/addons/product_margin/i18n/fr.po
+++ b/addons/product_margin/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/hr.po b/addons/product_margin/i18n/hr.po
index 561c3b1aae4..926bd0bbf1e 100644
--- a/addons/product_margin/i18n/hr.po
+++ b/addons/product_margin/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/hu.po b/addons/product_margin/i18n/hu.po
index 561c3b1aae4..926bd0bbf1e 100644
--- a/addons/product_margin/i18n/hu.po
+++ b/addons/product_margin/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/id.po b/addons/product_margin/i18n/id.po
index f5e7a0033ab..f98a1ad9744 100644
--- a/addons/product_margin/i18n/id.po
+++ b/addons/product_margin/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/it.po b/addons/product_margin/i18n/it.po
index 8cf01c5fe82..f6ab42e73e3 100644
--- a/addons/product_margin/i18n/it.po
+++ b/addons/product_margin/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/ko.po b/addons/product_margin/i18n/ko.po
index d75aaa59bbb..6510ee640a8 100644
--- a/addons/product_margin/i18n/ko.po
+++ b/addons/product_margin/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/lt.po b/addons/product_margin/i18n/lt.po
index 561c3b1aae4..926bd0bbf1e 100644
--- a/addons/product_margin/i18n/lt.po
+++ b/addons/product_margin/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/nl.po b/addons/product_margin/i18n/nl.po
index b01166b3c55..d0c7a83467f 100644
--- a/addons/product_margin/i18n/nl.po
+++ b/addons/product_margin/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/nl_BE.po b/addons/product_margin/i18n/nl_BE.po
index d39856ebef1..0a268de2452 100644
--- a/addons/product_margin/i18n/nl_BE.po
+++ b/addons/product_margin/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/pl.po b/addons/product_margin/i18n/pl.po
index 89ac30ab3b3..3a3b4fa0611 100644
--- a/addons/product_margin/i18n/pl.po
+++ b/addons/product_margin/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/pt.po b/addons/product_margin/i18n/pt.po
index b5f60bb0fae..ee4d908df7d 100644
--- a/addons/product_margin/i18n/pt.po
+++ b/addons/product_margin/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index a5a789e71e6..18a3aadca16 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/ro.po b/addons/product_margin/i18n/ro.po
index 561c3b1aae4..926bd0bbf1e 100644
--- a/addons/product_margin/i18n/ro.po
+++ b/addons/product_margin/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/ru.po b/addons/product_margin/i18n/ru.po
index 6f0e628e1f2..17908db9070 100644
--- a/addons/product_margin/i18n/ru.po
+++ b/addons/product_margin/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/sl.po b/addons/product_margin/i18n/sl.po
index 5a2e2877896..520b76f4e7b 100644
--- a/addons/product_margin/i18n/sl.po
+++ b/addons/product_margin/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/sv.po b/addons/product_margin/i18n/sv.po
index 4a44e03ecb6..1fc3012fecb 100644
--- a/addons/product_margin/i18n/sv.po
+++ b/addons/product_margin/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/tlh.po b/addons/product_margin/i18n/tlh.po
index 4427e02a2ab..5791ae100c5 100644
--- a/addons/product_margin/i18n/tlh.po
+++ b/addons/product_margin/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+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 6873953567e..071c9e2d3b3 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/uk.po b/addons/product_margin/i18n/uk.po
index 9fd807dc620..850be67b5d9 100644
--- a/addons/product_margin/i18n/uk.po
+++ b/addons/product_margin/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/zh_CN.po b/addons/product_margin/i18n/zh_CN.po
index c80ec7a88df..e1aef43bf12 100644
--- a/addons/product_margin/i18n/zh_CN.po
+++ b/addons/product_margin/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/zh_TW.po b/addons/product_margin/i18n/zh_TW.po
index defc1d75a78..7e045dd5dad 100644
--- a/addons/product_margin/i18n/zh_TW.po
+++ b/addons/product_margin/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 36ed9a70a33..eaf64179015 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-            
     <record model="ir.ui.view" id="view_product_margin_graph">
             <field name="name">product.margin.graph</field>
             <field name="model">product.product</field>
diff --git a/addons/profile_accounting/__terp__.py b/addons/profile_accounting/__openerp__.py
similarity index 100%
rename from addons/profile_accounting/__terp__.py
rename to addons/profile_accounting/__openerp__.py
diff --git a/addons/profile_accounting/i18n/ar.po b/addons/profile_accounting/i18n/ar.po
index b2db90ddd73..c30b9033e64 100644
--- a/addons/profile_accounting/i18n/ar.po
+++ b/addons/profile_accounting/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/bg.po b/addons/profile_accounting/i18n/bg.po
index 49b530ba60f..06a22742290 100644
--- a/addons/profile_accounting/i18n/bg.po
+++ b/addons/profile_accounting/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/bs.po b/addons/profile_accounting/i18n/bs.po
index 39a08c846c6..49a10a19622 100644
--- a/addons/profile_accounting/i18n/bs.po
+++ b/addons/profile_accounting/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/ca.po b/addons/profile_accounting/i18n/ca.po
index cab03fea221..0c36d4185b2 100644
--- a/addons/profile_accounting/i18n/ca.po
+++ b/addons/profile_accounting/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/cs.po b/addons/profile_accounting/i18n/cs.po
index b2db90ddd73..c30b9033e64 100644
--- a/addons/profile_accounting/i18n/cs.po
+++ b/addons/profile_accounting/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/de.po b/addons/profile_accounting/i18n/de.po
index 77750dc7099..8f467f8204e 100644
--- a/addons/profile_accounting/i18n/de.po
+++ b/addons/profile_accounting/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/el.po b/addons/profile_accounting/i18n/el.po
index 40c2fa4ab33..bd433ea026c 100644
--- a/addons/profile_accounting/i18n/el.po
+++ b/addons/profile_accounting/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/profile_accounting/i18n/es.po b/addons/profile_accounting/i18n/es.po
index 74370e73a99..287d43f5da9 100644
--- a/addons/profile_accounting/i18n/es.po
+++ b/addons/profile_accounting/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/es_AR.po b/addons/profile_accounting/i18n/es_AR.po
index 160e59fa1b6..fd91ff2de52 100644
--- a/addons/profile_accounting/i18n/es_AR.po
+++ b/addons/profile_accounting/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/et.po b/addons/profile_accounting/i18n/et.po
index e876a2ff6b8..a3c6fa78df1 100644
--- a/addons/profile_accounting/i18n/et.po
+++ b/addons/profile_accounting/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/fr.po b/addons/profile_accounting/i18n/fr.po
index fcae7dd5b36..1e06cf29db1 100644
--- a/addons/profile_accounting/i18n/fr.po
+++ b/addons/profile_accounting/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/hr.po b/addons/profile_accounting/i18n/hr.po
index b2db90ddd73..c30b9033e64 100644
--- a/addons/profile_accounting/i18n/hr.po
+++ b/addons/profile_accounting/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/hu.po b/addons/profile_accounting/i18n/hu.po
index b2db90ddd73..c30b9033e64 100644
--- a/addons/profile_accounting/i18n/hu.po
+++ b/addons/profile_accounting/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/id.po b/addons/profile_accounting/i18n/id.po
index b4da4a4dda7..337d50b3d5f 100644
--- a/addons/profile_accounting/i18n/id.po
+++ b/addons/profile_accounting/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/it.po b/addons/profile_accounting/i18n/it.po
index c4aec433529..b33d29d4ca8 100644
--- a/addons/profile_accounting/i18n/it.po
+++ b/addons/profile_accounting/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/ko.po b/addons/profile_accounting/i18n/ko.po
index fb98a8cd94f..f05a2195479 100644
--- a/addons/profile_accounting/i18n/ko.po
+++ b/addons/profile_accounting/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/lt.po b/addons/profile_accounting/i18n/lt.po
index b2db90ddd73..c30b9033e64 100644
--- a/addons/profile_accounting/i18n/lt.po
+++ b/addons/profile_accounting/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/nl.po b/addons/profile_accounting/i18n/nl.po
index 390bae6c716..37b28819b0c 100644
--- a/addons/profile_accounting/i18n/nl.po
+++ b/addons/profile_accounting/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/nl_BE.po b/addons/profile_accounting/i18n/nl_BE.po
index 5bf8a40ba53..f52b6065836 100644
--- a/addons/profile_accounting/i18n/nl_BE.po
+++ b/addons/profile_accounting/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/pl.po b/addons/profile_accounting/i18n/pl.po
index 6c9051a1f1c..2322b2ce98e 100644
--- a/addons/profile_accounting/i18n/pl.po
+++ b/addons/profile_accounting/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/pt.po b/addons/profile_accounting/i18n/pt.po
index f285b92882e..604a2d49562 100644
--- a/addons/profile_accounting/i18n/pt.po
+++ b/addons/profile_accounting/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/pt_BR.po b/addons/profile_accounting/i18n/pt_BR.po
index 62759eb5b61..39a748c1814 100644
--- a/addons/profile_accounting/i18n/pt_BR.po
+++ b/addons/profile_accounting/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/ro.po b/addons/profile_accounting/i18n/ro.po
index 1439286d58e..be505c014b1 100644
--- a/addons/profile_accounting/i18n/ro.po
+++ b/addons/profile_accounting/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/ru.po b/addons/profile_accounting/i18n/ru.po
index 188cdf454b0..5cbb1163ae4 100644
--- a/addons/profile_accounting/i18n/ru.po
+++ b/addons/profile_accounting/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/sl.po b/addons/profile_accounting/i18n/sl.po
index 207ff870535..e3e1d9d836c 100644
--- a/addons/profile_accounting/i18n/sl.po
+++ b/addons/profile_accounting/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/sv.po b/addons/profile_accounting/i18n/sv.po
index 76e58167586..2ddc1b08b40 100644
--- a/addons/profile_accounting/i18n/sv.po
+++ b/addons/profile_accounting/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/tlh.po b/addons/profile_accounting/i18n/tlh.po
index 99be6cb146a..0fe3d216163 100644
--- a/addons/profile_accounting/i18n/tlh.po
+++ b/addons/profile_accounting/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/tr.po b/addons/profile_accounting/i18n/tr.po
index a3fa628d724..881c62d907a 100644
--- a/addons/profile_accounting/i18n/tr.po
+++ b/addons/profile_accounting/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/uk.po b/addons/profile_accounting/i18n/uk.po
index 81763911f45..36e75ab8daa 100644
--- a/addons/profile_accounting/i18n/uk.po
+++ b/addons/profile_accounting/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/zh_CN.po b/addons/profile_accounting/i18n/zh_CN.po
index dc4dabd3b92..d745deb256c 100644
--- a/addons/profile_accounting/i18n/zh_CN.po
+++ b/addons/profile_accounting/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_accounting/i18n/zh_TW.po b/addons/profile_accounting/i18n/zh_TW.po
index 6048e8a7aef..8ece6f304bb 100644
--- a/addons/profile_accounting/i18n/zh_TW.po
+++ b/addons/profile_accounting/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/profile_association/i18n/ar.po b/addons/profile_association/i18n/ar.po
index e12d83034e0..e6fae88fe9c 100644
--- a/addons/profile_association/i18n/ar.po
+++ b/addons/profile_association/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/bg.po b/addons/profile_association/i18n/bg.po
index 785b0a3a805..ab36738942b 100644
--- a/addons/profile_association/i18n/bg.po
+++ b/addons/profile_association/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/bs.po b/addons/profile_association/i18n/bs.po
index b6a4ac6afed..41de915fc5e 100644
--- a/addons/profile_association/i18n/bs.po
+++ b/addons/profile_association/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/ca.po b/addons/profile_association/i18n/ca.po
index cf7ae2c4c5f..e3774a0916d 100644
--- a/addons/profile_association/i18n/ca.po
+++ b/addons/profile_association/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/cs.po b/addons/profile_association/i18n/cs.po
index 9dbfa982704..f49f3317700 100644
--- a/addons/profile_association/i18n/cs.po
+++ b/addons/profile_association/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/de.po b/addons/profile_association/i18n/de.po
index 3d9125aca15..3475f57ba96 100644
--- a/addons/profile_association/i18n/de.po
+++ b/addons/profile_association/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/es.po b/addons/profile_association/i18n/es.po
index 484da70b8b5..3dbcef752e7 100644
--- a/addons/profile_association/i18n/es.po
+++ b/addons/profile_association/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/es_AR.po b/addons/profile_association/i18n/es_AR.po
index 7434e47513a..bd255abff30 100644
--- a/addons/profile_association/i18n/es_AR.po
+++ b/addons/profile_association/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/et.po b/addons/profile_association/i18n/et.po
index 83ea27f5853..180e409c825 100644
--- a/addons/profile_association/i18n/et.po
+++ b/addons/profile_association/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/fr.po b/addons/profile_association/i18n/fr.po
index 419cd1b7396..c1abdfa8764 100644
--- a/addons/profile_association/i18n/fr.po
+++ b/addons/profile_association/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/hr.po b/addons/profile_association/i18n/hr.po
index e12d83034e0..e6fae88fe9c 100644
--- a/addons/profile_association/i18n/hr.po
+++ b/addons/profile_association/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/hu.po b/addons/profile_association/i18n/hu.po
index e12d83034e0..e6fae88fe9c 100644
--- a/addons/profile_association/i18n/hu.po
+++ b/addons/profile_association/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/id.po b/addons/profile_association/i18n/id.po
index d7abfbaa342..e5209596e3f 100644
--- a/addons/profile_association/i18n/id.po
+++ b/addons/profile_association/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/it.po b/addons/profile_association/i18n/it.po
index d4f718aed83..8ece3d3448e 100644
--- a/addons/profile_association/i18n/it.po
+++ b/addons/profile_association/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/ko.po b/addons/profile_association/i18n/ko.po
index 196bc37e73b..c8be602ae8c 100644
--- a/addons/profile_association/i18n/ko.po
+++ b/addons/profile_association/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/lt.po b/addons/profile_association/i18n/lt.po
index e12d83034e0..e6fae88fe9c 100644
--- a/addons/profile_association/i18n/lt.po
+++ b/addons/profile_association/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/nl.po b/addons/profile_association/i18n/nl.po
index 7346bc3d547..569a4e12f32 100644
--- a/addons/profile_association/i18n/nl.po
+++ b/addons/profile_association/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/nl_BE.po b/addons/profile_association/i18n/nl_BE.po
index 207beb0a04d..c8eb878bd91 100644
--- a/addons/profile_association/i18n/nl_BE.po
+++ b/addons/profile_association/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/pl.po b/addons/profile_association/i18n/pl.po
index 15921979a34..02ef6e5f987 100644
--- a/addons/profile_association/i18n/pl.po
+++ b/addons/profile_association/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/pt.po b/addons/profile_association/i18n/pt.po
index 15d9eafac99..a0e648efbd0 100644
--- a/addons/profile_association/i18n/pt.po
+++ b/addons/profile_association/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/pt_BR.po b/addons/profile_association/i18n/pt_BR.po
index 8a157089629..136fa843587 100644
--- a/addons/profile_association/i18n/pt_BR.po
+++ b/addons/profile_association/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/ro.po b/addons/profile_association/i18n/ro.po
index e12d83034e0..e6fae88fe9c 100644
--- a/addons/profile_association/i18n/ro.po
+++ b/addons/profile_association/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/ru.po b/addons/profile_association/i18n/ru.po
index 198532bbdd2..2f777c640a7 100644
--- a/addons/profile_association/i18n/ru.po
+++ b/addons/profile_association/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/sl.po b/addons/profile_association/i18n/sl.po
index 0729fe03527..3730fbef7c5 100644
--- a/addons/profile_association/i18n/sl.po
+++ b/addons/profile_association/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/sv.po b/addons/profile_association/i18n/sv.po
index 17bce349399..f490e621b43 100644
--- a/addons/profile_association/i18n/sv.po
+++ b/addons/profile_association/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/tlh.po b/addons/profile_association/i18n/tlh.po
index cd60128f2b8..22a7edbe164 100644
--- a/addons/profile_association/i18n/tlh.po
+++ b/addons/profile_association/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/tr.po b/addons/profile_association/i18n/tr.po
index 3a9d7dca69e..6c4ce0aa489 100644
--- a/addons/profile_association/i18n/tr.po
+++ b/addons/profile_association/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/uk.po b/addons/profile_association/i18n/uk.po
index c8a65c941ec..acd16c61b06 100644
--- a/addons/profile_association/i18n/uk.po
+++ b/addons/profile_association/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/zh_CN.po b/addons/profile_association/i18n/zh_CN.po
index 5c1605ad648..9a8d3dd0fd1 100644
--- a/addons/profile_association/i18n/zh_CN.po
+++ b/addons/profile_association/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_association/i18n/zh_TW.po b/addons/profile_association/i18n/zh_TW.po
index 9db74c21153..cae24e4f918 100644
--- a/addons/profile_association/i18n/zh_TW.po
+++ b/addons/profile_association/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
diff --git a/addons/profile_auction/i18n/ar.po b/addons/profile_auction/i18n/ar.po
index fba3fd23722..e3e8bacb646 100644
--- a/addons/profile_auction/i18n/ar.po
+++ b/addons/profile_auction/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/bg.po b/addons/profile_auction/i18n/bg.po
index 98a4f4c9613..96d47c4b3e2 100644
--- a/addons/profile_auction/i18n/bg.po
+++ b/addons/profile_auction/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/bs.po b/addons/profile_auction/i18n/bs.po
index 76fe2276754..3be355a7efb 100644
--- a/addons/profile_auction/i18n/bs.po
+++ b/addons/profile_auction/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/ca.po b/addons/profile_auction/i18n/ca.po
index e153b646c4d..de67f73b7e3 100644
--- a/addons/profile_auction/i18n/ca.po
+++ b/addons/profile_auction/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/cs.po b/addons/profile_auction/i18n/cs.po
index 9f6447a48cb..1fab2d635a1 100644
--- a/addons/profile_auction/i18n/cs.po
+++ b/addons/profile_auction/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/csb.po b/addons/profile_auction/i18n/csb.po
index f3577430480..3c293540469 100644
--- a/addons/profile_auction/i18n/csb.po
+++ b/addons/profile_auction/i18n/csb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/de.po b/addons/profile_auction/i18n/de.po
index d904e5a50d1..1f74d136b50 100644
--- a/addons/profile_auction/i18n/de.po
+++ b/addons/profile_auction/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/es.po b/addons/profile_auction/i18n/es.po
index c11294d7d57..a05c8b5c33d 100644
--- a/addons/profile_auction/i18n/es.po
+++ b/addons/profile_auction/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/es_AR.po b/addons/profile_auction/i18n/es_AR.po
index 8d7ab7fb68d..f12b7cdffa6 100644
--- a/addons/profile_auction/i18n/es_AR.po
+++ b/addons/profile_auction/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/et.po b/addons/profile_auction/i18n/et.po
index 76ab425b753..12850c65842 100644
--- a/addons/profile_auction/i18n/et.po
+++ b/addons/profile_auction/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/fr.po b/addons/profile_auction/i18n/fr.po
index 4cf21740d54..75753c572c0 100644
--- a/addons/profile_auction/i18n/fr.po
+++ b/addons/profile_auction/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/gl.po b/addons/profile_auction/i18n/gl.po
index c1ae5704fec..98b8aee9755 100644
--- a/addons/profile_auction/i18n/gl.po
+++ b/addons/profile_auction/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/hr.po b/addons/profile_auction/i18n/hr.po
index 020226933b6..2036768e8f4 100644
--- a/addons/profile_auction/i18n/hr.po
+++ b/addons/profile_auction/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/hu.po b/addons/profile_auction/i18n/hu.po
index fba3fd23722..e3e8bacb646 100644
--- a/addons/profile_auction/i18n/hu.po
+++ b/addons/profile_auction/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/id.po b/addons/profile_auction/i18n/id.po
index ebeeb530e2b..d4a014100f9 100644
--- a/addons/profile_auction/i18n/id.po
+++ b/addons/profile_auction/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/it.po b/addons/profile_auction/i18n/it.po
index d910797f5c4..5cc26c0e8e7 100644
--- a/addons/profile_auction/i18n/it.po
+++ b/addons/profile_auction/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/ko.po b/addons/profile_auction/i18n/ko.po
index a4b48b2a22c..5b3dc501262 100644
--- a/addons/profile_auction/i18n/ko.po
+++ b/addons/profile_auction/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/lt.po b/addons/profile_auction/i18n/lt.po
index ee6a21b3569..269dde1e5a5 100644
--- a/addons/profile_auction/i18n/lt.po
+++ b/addons/profile_auction/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/nl.po b/addons/profile_auction/i18n/nl.po
index 158416fbd13..089aa575510 100644
--- a/addons/profile_auction/i18n/nl.po
+++ b/addons/profile_auction/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/nl_BE.po b/addons/profile_auction/i18n/nl_BE.po
index b0bbded828b..f980a18b452 100644
--- a/addons/profile_auction/i18n/nl_BE.po
+++ b/addons/profile_auction/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/pl.po b/addons/profile_auction/i18n/pl.po
index 3979ce7eb4d..6a56d025810 100644
--- a/addons/profile_auction/i18n/pl.po
+++ b/addons/profile_auction/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/pt.po b/addons/profile_auction/i18n/pt.po
index d12e8632373..74d230d4e92 100644
--- a/addons/profile_auction/i18n/pt.po
+++ b/addons/profile_auction/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/pt_BR.po b/addons/profile_auction/i18n/pt_BR.po
index 8de62596408..2b5644f5264 100644
--- a/addons/profile_auction/i18n/pt_BR.po
+++ b/addons/profile_auction/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/ro.po b/addons/profile_auction/i18n/ro.po
index 43df4988be8..9202f46f10a 100644
--- a/addons/profile_auction/i18n/ro.po
+++ b/addons/profile_auction/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/ru.po b/addons/profile_auction/i18n/ru.po
index fba3fd23722..e3e8bacb646 100644
--- a/addons/profile_auction/i18n/ru.po
+++ b/addons/profile_auction/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/sk.po b/addons/profile_auction/i18n/sk.po
index 6cad22a3a4f..439f0e9f52c 100644
--- a/addons/profile_auction/i18n/sk.po
+++ b/addons/profile_auction/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/sl.po b/addons/profile_auction/i18n/sl.po
index 09c61d3a88d..98c0de4e629 100644
--- a/addons/profile_auction/i18n/sl.po
+++ b/addons/profile_auction/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/sv.po b/addons/profile_auction/i18n/sv.po
index ee6a21b3569..269dde1e5a5 100644
--- a/addons/profile_auction/i18n/sv.po
+++ b/addons/profile_auction/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/tr.po b/addons/profile_auction/i18n/tr.po
index 08ca9ca8ca0..4e4a96f74f7 100644
--- a/addons/profile_auction/i18n/tr.po
+++ b/addons/profile_auction/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/uk.po b/addons/profile_auction/i18n/uk.po
index 30269d2d307..bc56a546cbd 100644
--- a/addons/profile_auction/i18n/uk.po
+++ b/addons/profile_auction/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/zh_CN.po b/addons/profile_auction/i18n/zh_CN.po
index 93e0b52a8c4..365bdf973bc 100644
--- a/addons/profile_auction/i18n/zh_CN.po
+++ b/addons/profile_auction/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_auction/i18n/zh_TW.po b/addons/profile_auction/i18n/zh_TW.po
index fba3fd23722..e3e8bacb646 100644
--- a/addons/profile_auction/i18n/zh_TW.po
+++ b/addons/profile_auction/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
diff --git a/addons/profile_crm/i18n/ar.po b/addons/profile_crm/i18n/ar.po
index 0fc2f23f749..bffedbdd99b 100644
--- a/addons/profile_crm/i18n/ar.po
+++ b/addons/profile_crm/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/bg.po b/addons/profile_crm/i18n/bg.po
index 856109c296c..cd25cf22700 100644
--- a/addons/profile_crm/i18n/bg.po
+++ b/addons/profile_crm/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/bs.po b/addons/profile_crm/i18n/bs.po
index 0fc2f23f749..bffedbdd99b 100644
--- a/addons/profile_crm/i18n/bs.po
+++ b/addons/profile_crm/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/ca.po b/addons/profile_crm/i18n/ca.po
index fcdd1d54f4c..168a593b77e 100644
--- a/addons/profile_crm/i18n/ca.po
+++ b/addons/profile_crm/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/cs.po b/addons/profile_crm/i18n/cs.po
index 576f5e59628..202dee4f678 100644
--- a/addons/profile_crm/i18n/cs.po
+++ b/addons/profile_crm/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/da.po b/addons/profile_crm/i18n/da.po
index c7f9cebf507..39848158f35 100644
--- a/addons/profile_crm/i18n/da.po
+++ b/addons/profile_crm/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/de.po b/addons/profile_crm/i18n/de.po
index ee21788105b..ca28ca9ce45 100644
--- a/addons/profile_crm/i18n/de.po
+++ b/addons/profile_crm/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/el.po b/addons/profile_crm/i18n/el.po
index 4b8aae66a29..43e02e4141d 100644
--- a/addons/profile_crm/i18n/el.po
+++ b/addons/profile_crm/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/profile_crm/i18n/es.po b/addons/profile_crm/i18n/es.po
index 2460dacb684..4b07ed9cd19 100644
--- a/addons/profile_crm/i18n/es.po
+++ b/addons/profile_crm/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/es_AR.po b/addons/profile_crm/i18n/es_AR.po
index c5a1f1c87c6..3c35f87993e 100644
--- a/addons/profile_crm/i18n/es_AR.po
+++ b/addons/profile_crm/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/et.po b/addons/profile_crm/i18n/et.po
index c56e7d548df..2ac4c060ada 100644
--- a/addons/profile_crm/i18n/et.po
+++ b/addons/profile_crm/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/fr.po b/addons/profile_crm/i18n/fr.po
index 9a6252dbeea..b3a3bc62707 100644
--- a/addons/profile_crm/i18n/fr.po
+++ b/addons/profile_crm/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/gl.po b/addons/profile_crm/i18n/gl.po
index 2fd3cc49400..b24806b6295 100644
--- a/addons/profile_crm/i18n/gl.po
+++ b/addons/profile_crm/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/hr.po b/addons/profile_crm/i18n/hr.po
index 74b3beba236..ad6b043cff5 100644
--- a/addons/profile_crm/i18n/hr.po
+++ b/addons/profile_crm/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/hu.po b/addons/profile_crm/i18n/hu.po
index 0fc2f23f749..bffedbdd99b 100644
--- a/addons/profile_crm/i18n/hu.po
+++ b/addons/profile_crm/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/id.po b/addons/profile_crm/i18n/id.po
index 56b55cecc8a..c8b8464900f 100644
--- a/addons/profile_crm/i18n/id.po
+++ b/addons/profile_crm/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/it.po b/addons/profile_crm/i18n/it.po
index bad24bf71e3..65aa7eb1a97 100644
--- a/addons/profile_crm/i18n/it.po
+++ b/addons/profile_crm/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/ko.po b/addons/profile_crm/i18n/ko.po
index 3aa7317933f..5d7911b4429 100644
--- a/addons/profile_crm/i18n/ko.po
+++ b/addons/profile_crm/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/lt.po b/addons/profile_crm/i18n/lt.po
index c0f3a4e56ac..1c660300fd4 100644
--- a/addons/profile_crm/i18n/lt.po
+++ b/addons/profile_crm/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/nl.po b/addons/profile_crm/i18n/nl.po
index 8498cdd9591..eaa915d74f4 100644
--- a/addons/profile_crm/i18n/nl.po
+++ b/addons/profile_crm/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/nl_BE.po b/addons/profile_crm/i18n/nl_BE.po
index 5cd51414ec2..8ee81daf1f7 100644
--- a/addons/profile_crm/i18n/nl_BE.po
+++ b/addons/profile_crm/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/pl.po b/addons/profile_crm/i18n/pl.po
index 49f086c2ee7..3aa36f39bd8 100644
--- a/addons/profile_crm/i18n/pl.po
+++ b/addons/profile_crm/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/pt.po b/addons/profile_crm/i18n/pt.po
index 095dfb42606..130299839c4 100644
--- a/addons/profile_crm/i18n/pt.po
+++ b/addons/profile_crm/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/pt_BR.po b/addons/profile_crm/i18n/pt_BR.po
index b4dbb147fdf..c7ccc096609 100644
--- a/addons/profile_crm/i18n/pt_BR.po
+++ b/addons/profile_crm/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/ro.po b/addons/profile_crm/i18n/ro.po
index 3bc0811c9d4..16a528ae886 100644
--- a/addons/profile_crm/i18n/ro.po
+++ b/addons/profile_crm/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/ru.po b/addons/profile_crm/i18n/ru.po
index 5762d497e9c..216637668af 100644
--- a/addons/profile_crm/i18n/ru.po
+++ b/addons/profile_crm/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/sk.po b/addons/profile_crm/i18n/sk.po
index 24c3363c424..efc60358d71 100644
--- a/addons/profile_crm/i18n/sk.po
+++ b/addons/profile_crm/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/sl.po b/addons/profile_crm/i18n/sl.po
index c6d8cecee36..2a0c068cfe8 100644
--- a/addons/profile_crm/i18n/sl.po
+++ b/addons/profile_crm/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/sv.po b/addons/profile_crm/i18n/sv.po
index f0234a64b57..265c4fff66f 100644
--- a/addons/profile_crm/i18n/sv.po
+++ b/addons/profile_crm/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/tr.po b/addons/profile_crm/i18n/tr.po
index b6ded646b34..071bd976c20 100644
--- a/addons/profile_crm/i18n/tr.po
+++ b/addons/profile_crm/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/uk.po b/addons/profile_crm/i18n/uk.po
index 4a42c211630..4711143a987 100644
--- a/addons/profile_crm/i18n/uk.po
+++ b/addons/profile_crm/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/zh_CN.po b/addons/profile_crm/i18n/zh_CN.po
index d8112acb487..9d881a9715e 100644
--- a/addons/profile_crm/i18n/zh_CN.po
+++ b/addons/profile_crm/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_crm/i18n/zh_TW.po b/addons/profile_crm/i18n/zh_TW.po
index 0fc2f23f749..bffedbdd99b 100644
--- a/addons/profile_crm/i18n/zh_TW.po
+++ b/addons/profile_crm/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_manufacturing/__terp__.py b/addons/profile_manufacturing/__openerp__.py
similarity index 100%
rename from addons/profile_manufacturing/__terp__.py
rename to addons/profile_manufacturing/__openerp__.py
diff --git a/addons/profile_manufacturing/i18n/ar.po b/addons/profile_manufacturing/i18n/ar.po
index 9aa363ce74c..fb71d8b0504 100644
--- a/addons/profile_manufacturing/i18n/ar.po
+++ b/addons/profile_manufacturing/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/bg.po b/addons/profile_manufacturing/i18n/bg.po
index b1e64f54bea..dbf6f093342 100644
--- a/addons/profile_manufacturing/i18n/bg.po
+++ b/addons/profile_manufacturing/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/bs.po b/addons/profile_manufacturing/i18n/bs.po
index f351a3eeab9..57ee09f02de 100644
--- a/addons/profile_manufacturing/i18n/bs.po
+++ b/addons/profile_manufacturing/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/ca.po b/addons/profile_manufacturing/i18n/ca.po
index 92285dd98eb..cb34864e9df 100644
--- a/addons/profile_manufacturing/i18n/ca.po
+++ b/addons/profile_manufacturing/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/cs.po b/addons/profile_manufacturing/i18n/cs.po
index 9aa363ce74c..fb71d8b0504 100644
--- a/addons/profile_manufacturing/i18n/cs.po
+++ b/addons/profile_manufacturing/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/de.po b/addons/profile_manufacturing/i18n/de.po
index 7cbda85de1c..7f7c972f5cd 100644
--- a/addons/profile_manufacturing/i18n/de.po
+++ b/addons/profile_manufacturing/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/el.po b/addons/profile_manufacturing/i18n/el.po
index c829382ed6e..7db84baff89 100644
--- a/addons/profile_manufacturing/i18n/el.po
+++ b/addons/profile_manufacturing/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/profile_manufacturing/i18n/es.po b/addons/profile_manufacturing/i18n/es.po
index 39cfc93960b..92ea8b19782 100644
--- a/addons/profile_manufacturing/i18n/es.po
+++ b/addons/profile_manufacturing/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/es_AR.po b/addons/profile_manufacturing/i18n/es_AR.po
index 78a2211d18a..d6f3c9ea1e1 100644
--- a/addons/profile_manufacturing/i18n/es_AR.po
+++ b/addons/profile_manufacturing/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/et.po b/addons/profile_manufacturing/i18n/et.po
index 56ddc18ce38..57a3ac58281 100644
--- a/addons/profile_manufacturing/i18n/et.po
+++ b/addons/profile_manufacturing/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/fr.po b/addons/profile_manufacturing/i18n/fr.po
index d5d2a50e198..0972a087674 100644
--- a/addons/profile_manufacturing/i18n/fr.po
+++ b/addons/profile_manufacturing/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/hr.po b/addons/profile_manufacturing/i18n/hr.po
index 64c68a4f488..ace2f27a881 100644
--- a/addons/profile_manufacturing/i18n/hr.po
+++ b/addons/profile_manufacturing/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/hu.po b/addons/profile_manufacturing/i18n/hu.po
index 9aa363ce74c..9bb575c4a7e 100644
--- a/addons/profile_manufacturing/i18n/hu.po
+++ b/addons/profile_manufacturing/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/id.po b/addons/profile_manufacturing/i18n/id.po
index 291385b32d0..baebccba30a 100644
--- a/addons/profile_manufacturing/i18n/id.po
+++ b/addons/profile_manufacturing/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/it.po b/addons/profile_manufacturing/i18n/it.po
index 5c2f6398cf9..bb081a06bb5 100644
--- a/addons/profile_manufacturing/i18n/it.po
+++ b/addons/profile_manufacturing/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/ko.po b/addons/profile_manufacturing/i18n/ko.po
index 64dbecf42b7..ac009ccad2f 100644
--- a/addons/profile_manufacturing/i18n/ko.po
+++ b/addons/profile_manufacturing/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/lt.po b/addons/profile_manufacturing/i18n/lt.po
index 9aa363ce74c..9bb575c4a7e 100644
--- a/addons/profile_manufacturing/i18n/lt.po
+++ b/addons/profile_manufacturing/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/nl.po b/addons/profile_manufacturing/i18n/nl.po
index 79a37300dc5..3b07c5da62a 100644
--- a/addons/profile_manufacturing/i18n/nl.po
+++ b/addons/profile_manufacturing/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:04+0000\n"
-"Last-Translator: Freerk Kalsbeek (Mindswitch BV) <f.kalsbeek@mindswitch.nl>\n"
+"PO-Revision-Date: 2010-04-15 09:57+0000\n"
+"Last-Translator: The Loeki <the.loeki@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-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
@@ -110,7 +110,7 @@ msgstr ""
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Stock & Manufacturing"
-msgstr ""
+msgstr "Voorraad en productie"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
@@ -158,7 +158,7 @@ msgstr ""
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Install"
-msgstr ""
+msgstr "Installeren"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
@@ -168,7 +168,7 @@ msgstr ""
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
 msgid "Repair"
-msgstr ""
+msgstr "Reparatie"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
@@ -197,12 +197,12 @@ msgstr ""
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,warning:0
 msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
 msgid "Margins on Sales Order"
-msgstr ""
+msgstr "Marges op verkooporder"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
@@ -217,14 +217,14 @@ msgstr ""
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
 msgid "Point of Sale"
-msgstr ""
+msgstr "Verkooppunt"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
 msgid "Advanced Locations"
-msgstr ""
+msgstr "Uitgebreide locaties"
diff --git a/addons/profile_manufacturing/i18n/nl_BE.po b/addons/profile_manufacturing/i18n/nl_BE.po
index 06970eb8b5c..9815cf87350 100644
--- a/addons/profile_manufacturing/i18n/nl_BE.po
+++ b/addons/profile_manufacturing/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/pl.po b/addons/profile_manufacturing/i18n/pl.po
index 7ff2cc0a98f..4a7c7de9f7b 100644
--- a/addons/profile_manufacturing/i18n/pl.po
+++ b/addons/profile_manufacturing/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/pt.po b/addons/profile_manufacturing/i18n/pt.po
index 72eaf661d0d..c29f1a06f74 100644
--- a/addons/profile_manufacturing/i18n/pt.po
+++ b/addons/profile_manufacturing/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/pt_BR.po b/addons/profile_manufacturing/i18n/pt_BR.po
index 72e84b25f96..b7ebdce281a 100644
--- a/addons/profile_manufacturing/i18n/pt_BR.po
+++ b/addons/profile_manufacturing/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/ro.po b/addons/profile_manufacturing/i18n/ro.po
index 9aa363ce74c..9bb575c4a7e 100644
--- a/addons/profile_manufacturing/i18n/ro.po
+++ b/addons/profile_manufacturing/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/ru.po b/addons/profile_manufacturing/i18n/ru.po
index 3c0e59fb8f8..af21de1057b 100644
--- a/addons/profile_manufacturing/i18n/ru.po
+++ b/addons/profile_manufacturing/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/sl.po b/addons/profile_manufacturing/i18n/sl.po
index ceeaedf8d43..9de117d7c24 100644
--- a/addons/profile_manufacturing/i18n/sl.po
+++ b/addons/profile_manufacturing/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/sv.po b/addons/profile_manufacturing/i18n/sv.po
index 7f288715c92..f1755f9fd47 100644
--- a/addons/profile_manufacturing/i18n/sv.po
+++ b/addons/profile_manufacturing/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/tlh.po b/addons/profile_manufacturing/i18n/tlh.po
index f312947ceb4..0d5a9823038 100644
--- a/addons/profile_manufacturing/i18n/tlh.po
+++ b/addons/profile_manufacturing/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/tr.po b/addons/profile_manufacturing/i18n/tr.po
index 3df91389cdf..7cfce567c4d 100644
--- a/addons/profile_manufacturing/i18n/tr.po
+++ b/addons/profile_manufacturing/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/uk.po b/addons/profile_manufacturing/i18n/uk.po
index 6b677f873bb..24ab6e34ce9 100644
--- a/addons/profile_manufacturing/i18n/uk.po
+++ b/addons/profile_manufacturing/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/zh_CN.po b/addons/profile_manufacturing/i18n/zh_CN.po
index 9fc84dd8cb2..dab36fed3b4 100644
--- a/addons/profile_manufacturing/i18n/zh_CN.po
+++ b/addons/profile_manufacturing/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_manufacturing/i18n/zh_TW.po b/addons/profile_manufacturing/i18n/zh_TW.po
index 6c323918f45..64001b07c8e 100644
--- a/addons/profile_manufacturing/i18n/zh_TW.po
+++ b/addons/profile_manufacturing/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
diff --git a/addons/profile_service/i18n/ar.po b/addons/profile_service/i18n/ar.po
index 12107e6d0ae..66ba734f2fb 100644
--- a/addons/profile_service/i18n/ar.po
+++ b/addons/profile_service/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/bg.po b/addons/profile_service/i18n/bg.po
index 676cd85bef4..7819022d90f 100644
--- a/addons/profile_service/i18n/bg.po
+++ b/addons/profile_service/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/bs.po b/addons/profile_service/i18n/bs.po
index 657b754acb1..fb002ee132b 100644
--- a/addons/profile_service/i18n/bs.po
+++ b/addons/profile_service/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/ca.po b/addons/profile_service/i18n/ca.po
index 004080821dc..bb8a99917c6 100644
--- a/addons/profile_service/i18n/ca.po
+++ b/addons/profile_service/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/cs.po b/addons/profile_service/i18n/cs.po
index 12107e6d0ae..66ba734f2fb 100644
--- a/addons/profile_service/i18n/cs.po
+++ b/addons/profile_service/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/de.po b/addons/profile_service/i18n/de.po
index 4d3d50383a4..2e35c710802 100644
--- a/addons/profile_service/i18n/de.po
+++ b/addons/profile_service/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/el.po b/addons/profile_service/i18n/el.po
index 4cea4ca18b8..66c237f7218 100644
--- a/addons/profile_service/i18n/el.po
+++ b/addons/profile_service/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/profile_service/i18n/es.po b/addons/profile_service/i18n/es.po
index 6cf137504f8..0bef5e540f3 100644
--- a/addons/profile_service/i18n/es.po
+++ b/addons/profile_service/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/es_AR.po b/addons/profile_service/i18n/es_AR.po
index cf155818f65..de99294fc31 100644
--- a/addons/profile_service/i18n/es_AR.po
+++ b/addons/profile_service/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/et.po b/addons/profile_service/i18n/et.po
index f4e982deed8..69ebdd2c731 100644
--- a/addons/profile_service/i18n/et.po
+++ b/addons/profile_service/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/fi.po b/addons/profile_service/i18n/fi.po
index 286b021903b..87789e0e3b9 100644
--- a/addons/profile_service/i18n/fi.po
+++ b/addons/profile_service/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/fr.po b/addons/profile_service/i18n/fr.po
index 6b05c282964..9135590348a 100644
--- a/addons/profile_service/i18n/fr.po
+++ b/addons/profile_service/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/hr.po b/addons/profile_service/i18n/hr.po
index 12107e6d0ae..66ba734f2fb 100644
--- a/addons/profile_service/i18n/hr.po
+++ b/addons/profile_service/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/hu.po b/addons/profile_service/i18n/hu.po
index 12107e6d0ae..66ba734f2fb 100644
--- a/addons/profile_service/i18n/hu.po
+++ b/addons/profile_service/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/id.po b/addons/profile_service/i18n/id.po
index 98e11adef65..0d7fa7a29c6 100644
--- a/addons/profile_service/i18n/id.po
+++ b/addons/profile_service/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/it.po b/addons/profile_service/i18n/it.po
index c08c5655b59..a311e55e454 100644
--- a/addons/profile_service/i18n/it.po
+++ b/addons/profile_service/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/ko.po b/addons/profile_service/i18n/ko.po
index 0a281bb194e..fb247fa6e6f 100644
--- a/addons/profile_service/i18n/ko.po
+++ b/addons/profile_service/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/lt.po b/addons/profile_service/i18n/lt.po
index 12107e6d0ae..66ba734f2fb 100644
--- a/addons/profile_service/i18n/lt.po
+++ b/addons/profile_service/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/nl.po b/addons/profile_service/i18n/nl.po
index d3631b28566..92b9766b92d 100644
--- a/addons/profile_service/i18n/nl.po
+++ b/addons/profile_service/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/pl.po b/addons/profile_service/i18n/pl.po
index 6786eb27980..dd9c21962cd 100644
--- a/addons/profile_service/i18n/pl.po
+++ b/addons/profile_service/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/pt.po b/addons/profile_service/i18n/pt.po
index 1251cdfe8b1..311132e606a 100644
--- a/addons/profile_service/i18n/pt.po
+++ b/addons/profile_service/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/pt_BR.po b/addons/profile_service/i18n/pt_BR.po
index dfc4245e71f..ed57a507f46 100644
--- a/addons/profile_service/i18n/pt_BR.po
+++ b/addons/profile_service/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/ro.po b/addons/profile_service/i18n/ro.po
index 12107e6d0ae..66ba734f2fb 100644
--- a/addons/profile_service/i18n/ro.po
+++ b/addons/profile_service/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/ru.po b/addons/profile_service/i18n/ru.po
index 3bd89d299c6..cf33879f877 100644
--- a/addons/profile_service/i18n/ru.po
+++ b/addons/profile_service/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/sl.po b/addons/profile_service/i18n/sl.po
index ff38d1c30fd..b73461d289e 100644
--- a/addons/profile_service/i18n/sl.po
+++ b/addons/profile_service/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/sv.po b/addons/profile_service/i18n/sv.po
index 28d327533db..e0744f5dab5 100644
--- a/addons/profile_service/i18n/sv.po
+++ b/addons/profile_service/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/tlh.po b/addons/profile_service/i18n/tlh.po
index 2ec5090c3ac..535255bbb7e 100644
--- a/addons/profile_service/i18n/tlh.po
+++ b/addons/profile_service/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/tr.po b/addons/profile_service/i18n/tr.po
index c6f0290b69d..5ec4ca7d8af 100644
--- a/addons/profile_service/i18n/tr.po
+++ b/addons/profile_service/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/uk.po b/addons/profile_service/i18n/uk.po
index 37306b78427..431eae0debb 100644
--- a/addons/profile_service/i18n/uk.po
+++ b/addons/profile_service/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/zh_CN.po b/addons/profile_service/i18n/zh_CN.po
index 98e45945743..6741fec75dd 100644
--- a/addons/profile_service/i18n/zh_CN.po
+++ b/addons/profile_service/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_service/i18n/zh_TW.po b/addons/profile_service/i18n/zh_TW.po
index 86d982db172..ce91bf24c5c 100644
--- a/addons/profile_service/i18n/zh_TW.po
+++ b/addons/profile_service/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
diff --git a/addons/profile_tools/__terp__.py b/addons/profile_tools/__openerp__.py
similarity index 100%
rename from addons/profile_tools/__terp__.py
rename to addons/profile_tools/__openerp__.py
diff --git a/addons/project/__terp__.py b/addons/project/__openerp__.py
similarity index 97%
rename from addons/project/__terp__.py
rename to addons/project/__openerp__.py
index 65e3c58fb5e..3c7e80d4c11 100644
--- a/addons/project/__terp__.py
+++ b/addons/project/__openerp__.py
@@ -33,6 +33,7 @@ works done on tasks, eso. It is able to render planning, order tasks, eso.
     "init_xml" : [],
     "update_xml": [
         "security/project_security.xml",
+        "wizard/project_task_delegate_view.xml",
         "security/ir.model.access.csv",
         "project_data.xml",
         "project_wizard.xml",
diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index fbd4d6c5fc7..76bd2597cfe 100644
--- a/addons/project/i18n/ar.po
+++ b/addons/project/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index 4bae563a832..6a3347428d3 100644
--- a/addons/project/i18n/bg.po
+++ b/addons/project/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -175,7 +175,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr "Моите задачи в развитие"
+msgstr "Мои текущи задачи"
 
 #. module: project
 #: view:project.project:0
@@ -350,7 +350,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "My projects"
-msgstr "Моите проекти"
+msgstr "Мои проекти"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
@@ -454,14 +454,14 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
 #: model:ir.ui.menu,name:project.menu_tasks_yours_pending
 msgid "My Pending Tasks"
-msgstr "Моите отложени задачи"
+msgstr "Мои отложени задачи"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_opened
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr "Задачи в развитие"
+msgstr "Текущи задачи"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
@@ -478,7 +478,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr ""
+msgstr "Мои проекти"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
@@ -608,7 +608,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task4
 #: model:ir.ui.menu,name:project.menu_action_view_task4
 msgid "My Tasks"
-msgstr "Моите задачи"
+msgstr "Мои задачи"
 
 #. module: project
 #: view:project.project:0
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index eaa218e0679..38821f10eec 100644
--- a/addons/project/i18n/bs.po
+++ b/addons/project/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index 9228bf488d9..078d4ccbcf9 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index 000d287b820..d61610b77d9 100644
--- a/addons/project/i18n/cs.po
+++ b/addons/project/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 4e2285f328c..30934319ef5 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index 2f889f2a569..32dc23e61fa 100644
--- a/addons/project/i18n/el.po
+++ b/addons/project/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index 070eb832fcc..0a07247c901 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index cbb726b479a..df44c6c9c38 100644
--- a/addons/project/i18n/es_AR.po
+++ b/addons/project/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/es_EC.po b/addons/project/i18n/es_EC.po
index ba6b5c81e6f..49443b434be 100644
--- a/addons/project/i18n/es_EC.po
+++ b/addons/project/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index 260c7b9c3ab..81893655905 100644
--- a/addons/project/i18n/et.po
+++ b/addons/project/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/fi.po b/addons/project/i18n/fi.po
index 00e8a03153e..f1c120a4c90 100644
--- a/addons/project/i18n/fi.po
+++ b/addons/project/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 684bbb06f2b..2c2ed96286d 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index a2fb953efa2..ea51f087741 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index fbd4d6c5fc7..76bd2597cfe 100644
--- a/addons/project/i18n/hu.po
+++ b/addons/project/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index 3c4cbf3341e..67e3496e269 100644
--- a/addons/project/i18n/id.po
+++ b/addons/project/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 166d5bfefb3..106c705c508 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index 44f6c1827a1..8f810fe9e13 100644
--- a/addons/project/i18n/ko.po
+++ b/addons/project/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 04748e4c3d9..50591b5ccd0 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index f64995e1572..6dfb8dd80e1 100644
--- a/addons/project/i18n/lv.po
+++ b/addons/project/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 886248d16d4..a401f752ea9 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index 1ff621407ac..e15937205ec 100644
--- a/addons/project/i18n/nl_BE.po
+++ b/addons/project/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index e69f19b9ea1..8bec8258428 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:45+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-20 08:36+0000\n"
+"Last-Translator: PROSID <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-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -29,7 +29,7 @@ msgstr "Proces zadań"
 #. module: project
 #: help:project.task.delegate,init,name:0
 msgid "New title of the task delegated to the user."
-msgstr "Nowy tytułzadania delegowanego na użytkownika"
+msgstr "Nowy tytuł zadania przydzielonego użytkownikowi"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -87,7 +87,7 @@ msgstr "Członkowie projektu"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr ""
+msgstr "Zadania wg przydzieleń"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_my_run
@@ -98,7 +98,7 @@ msgstr ""
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr ""
+msgstr "Przydzielone zadania"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -120,7 +120,7 @@ msgstr "Uaktualnij"
 #. module: project
 #: help:project.task.delegate,init,user_id:0
 msgid "User you want to delegate this task to."
-msgstr "Użytkownik, któremu chcesz delegować to zadanie."
+msgstr "Użytkownik, któremu chcesz przydzielić to zadanie."
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
@@ -178,7 +178,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr "Moje zadania w trakcie przetwarzania"
+msgstr "Moje zadania w toku"
 
 #. module: project
 #: view:project.project:0
@@ -203,7 +203,7 @@ msgid ""
 "delegate this task."
 msgstr ""
 "Szacowany czas na zatwierdzenie pracy wykonanej przez użytkownika, któremu "
-"delegowałeś to zadania."
+"przydzieliłeś to zadanie."
 
 #. module: project
 #: view:project.project:0
@@ -273,7 +273,7 @@ msgstr "Zadanie zostało wypełnione"
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr "Deleguje zadanie na innego użytkownika"
+msgstr "Przydziela zadanie innemu użytkownikowi"
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -344,7 +344,7 @@ msgstr "Przywróć jako projekt"
 #. module: project
 #: view:project.task:0
 msgid "Delegations"
-msgstr "Delegacje"
+msgstr "Przydziały"
 
 #. module: project
 #: help:project.project,members:0
@@ -371,7 +371,7 @@ msgstr "Ze stanu Projekt przechodzi w stan Otwarty"
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegated Task"
-msgstr "Zadania oddelegowane"
+msgstr "Przydzielone zadanie"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -448,7 +448,7 @@ msgstr "Czas planowany"
 #: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr "Praca zadania"
+msgstr "Przebieg zadania"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
@@ -466,7 +466,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr "Zadania w trakcie przetwarzania"
+msgstr "Zadania w toku"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
@@ -477,7 +477,7 @@ msgstr "Zadania nieprzypisane"
 #. module: project
 #: wizard_field:project.task.delegate,init,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Przydzielony tytuł"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project
@@ -489,7 +489,7 @@ msgstr "Moje projekty"
 #: help:project.task.delegate,init,planned_hours:0
 msgid "Estimated time to close this task by the delegated user."
 msgstr ""
-"Szacowany czas do zamknięcia tego zadania przez delegowanego użytkownika."
+"Szacowany czas do zamknięcia tego zadania przez przydzielonego użytkownika."
 
 #. module: project
 #: selection:project.project,state:0
@@ -542,7 +542,7 @@ msgstr "Użytkownik: %(user_id)s"
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Opóźnienie"
 
 #. module: project
 #: field:project.project,contact_id:0
@@ -553,7 +553,7 @@ msgstr "Kontakt"
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr "Deleguj"
+msgstr "Przydziel"
 
 #. module: project
 #: constraint:ir.ui.view:0
@@ -634,7 +634,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr "Delegowane zadania"
+msgstr "Przydzielone zadania"
 
 #. module: project
 #: view:project.task:0
@@ -644,7 +644,7 @@ msgstr "Informacja"
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr "Przegląd"
+msgstr "Rewiduj"
 
 #. module: project
 #: view:project.project:0
@@ -685,7 +685,7 @@ msgstr "Menedżer projektu"
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
-msgstr "Oczekujący"
+msgstr "Oczekiwanie"
 
 #. module: project
 #: field:project.task,state:0
@@ -698,6 +698,8 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed."
 msgstr ""
+"Nowy stan twojego zadania. Oczekujące zostanie automatycznie otwarte kiedy "
+"przydzielone zadanie zostanie zamknięte."
 
 #. module: project
 #: field:res.company,project_time_mode:0
@@ -805,12 +807,12 @@ msgstr "Pilne"
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegate this task to a user"
-msgstr "Deleguj to zadanie na użytkownika"
+msgstr "Przydziel to zadanie użytkownikowi"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr "Delegowane na"
+msgstr "Przydzielono"
 
 #. module: project
 #: field:project.task,date_close:0
@@ -829,7 +831,7 @@ msgid ""
 "task is in draft state."
 msgstr ""
 "Szacowany czas wykonania zadania. Zwykle ustalany przez menedżera projektu "
-"kiesy zadanie jest w stanie projektu."
+"kiedy zadanie jest w stanie projektu."
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -930,7 +932,7 @@ msgstr ""
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr "W trakcie przetwarzania"
+msgstr "W toku"
 
 #. module: project
 #: constraint:ir.model:0
@@ -1144,7 +1146,7 @@ msgstr "Spodziewany koniec"
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr "Przydziel swoje zadania na innego użytkownika"
+msgstr "Przydziel swoje zadania innemu użytkownikowi"
 
 #. module: project
 #: view:project.project:0
@@ -1156,4 +1158,4 @@ msgstr "Stopka wiadomości"
 #: model:ir.actions.act_window,name:project.open_view_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
-msgstr "Projekty w trakcie przetwarzania"
+msgstr "Bieżące projekty"
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index 76893e85eb3..354d85bb5d7 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 7ab868b3a59..17b221b6285 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index a11f0246db7..76bd2597cfe 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+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 bf65d5f8234..94c3d58de8f 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-25 21:17+0000\n"
-"Last-Translator: marath <Unknown>\n"
+"PO-Revision-Date: 2010-04-13 05:53+0000\n"
+"Last-Translator: grisha <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-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -24,12 +24,12 @@ msgstr "Назначенные задания"
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
 msgid "Tasks Process"
-msgstr ""
+msgstr "Ход заданий"
 
 #. module: project
 #: help:project.task.delegate,init,name:0
 msgid "New title of the task delegated to the user."
-msgstr "Новое название задания, порученного пользователю."
+msgstr "Новый заголовок задания, назначенного пользователю"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -44,17 +44,17 @@ msgstr "Закрыть задание"
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Задания проекта"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Открыть выполненные задания"
 
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -108,6 +108,8 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Заголовок, добавляемый в начало электронного письма для предупреждения, "
+"отправляемого заказчику при закрытии задачи."
 
 #. module: project
 #: field:project.task,priority:0
@@ -182,7 +184,7 @@ msgstr "Мои выполняемые задания"
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Установить как Шаблон"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
@@ -246,6 +248,8 @@ msgstr "Мои Черновики заданий"
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
+"Автоматические переменные для колонтитулов. Используйте в точности то же "
+"самое написание."
 
 #. module: project
 #: selection:project.project,state:0
@@ -262,7 +266,7 @@ msgstr "Заголовок письма"
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "Выполненное задание"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
@@ -272,7 +276,7 @@ msgstr "Задание завершено"
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "Поручить задания другому пользователю"
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -412,7 +416,7 @@ msgstr "Тип"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Weeks"
-msgstr ""
+msgstr "Нед"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
@@ -523,7 +527,7 @@ msgstr "Проекты"
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Даты"
 
 #. module: project
 #: field:project.task,history:0
@@ -650,7 +654,7 @@ msgstr "Информация"
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr ""
+msgstr "Обзор"
 
 #. module: project
 #: view:project.project:0
@@ -682,7 +686,7 @@ msgstr "Низкий"
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Руководитель проекта"
 
 #. module: project
 #: view:project.project:0
@@ -714,7 +718,7 @@ msgstr ""
 #: field:project.project,complete_name:0
 #: field:project.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Наименование проекта"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,mail_send:0
@@ -724,7 +728,7 @@ msgstr "Отправить сообщение"
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Всего времени"
 
 #. module: project
 #: field:project.task,active:0
@@ -734,7 +738,7 @@ msgstr "Активен"
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr ""
+msgstr "Ошибка"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
@@ -765,12 +769,12 @@ msgstr "Открыть задание"
 #. module: project
 #: field:project.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Рабочее время"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Months"
-msgstr ""
+msgstr "Мес"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -798,7 +802,7 @@ msgstr "Проекты пользователя"
 #. module: project
 #: view:project.project:0
 msgid "Reactivate Project"
-msgstr ""
+msgstr "Возобновить проект"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -813,7 +817,7 @@ msgstr "Делегировать данное задание пользоват
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Поручено"
 
 #. module: project
 #: field:project.task,date_close:0
diff --git a/addons/project/i18n/sk.po b/addons/project/i18n/sk.po
index cfd3227343d..3121db20fc3 100644
--- a/addons/project/i18n/sk.po
+++ b/addons/project/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index 7e11d919ae2..8a2e7bcc2a7 100644
--- a/addons/project/i18n/sl.po
+++ b/addons/project/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index 87abf6eb123..f8cca022ba4 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index 6159cc2df23..8b05adb3492 100644
--- a/addons/project/i18n/tlh.po
+++ b/addons/project/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+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 25e36280bc3..21fb9b3904f 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index 0d6595059ac..b4edc362e72 100644
--- a/addons/project/i18n/uk.po
+++ b/addons/project/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index e12d189e37c..0b18ea34b98 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -34,7 +34,7 @@ msgstr "这用户的任务委派新标题"
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Change Remaining Hours"
-msgstr "改变剩余时间"
+msgstr "修改剩余时间"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_close_task
@@ -44,7 +44,7 @@ msgstr "关闭任务"
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr "项目任务"
+msgstr "项目任务列表"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -54,7 +54,7 @@ msgstr "打开完成任务"
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
+msgstr "在动作定义使用了无效的模型名称。"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -72,7 +72,7 @@ msgstr "进展"
 msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
-msgstr "总剩余时间.能由任务分派人重新估计"
+msgstr "总剩余时间,任务接收者能重新估计"
 
 #. module: project
 #: field:project.project,child_id:0
@@ -82,7 +82,7 @@ msgstr "子项目"
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr "项目管理"
+msgstr "项目成员"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
@@ -292,7 +292,7 @@ msgstr "在这用户任务中包含任务说明"
 #. module: project
 #: field:project.project,category_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算科目"
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -347,7 +347,7 @@ msgstr "委派"
 #: help:project.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
-msgstr "项目成员不用于任何计算,只是为了信息"
+msgstr "项目成员不使用任何计算只是为了显示"
 
 #. module: project
 #: view:project.project:0
@@ -393,7 +393,7 @@ msgstr "上级项目"
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr "计算:花费时间 + 剩余时间"
+msgstr "计算:花费的时间 + 剩余的时间"
 
 #. module: project
 #: field:project.task,type:0
@@ -421,7 +421,7 @@ msgstr "新项目"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Medium"
-msgstr "媒体"
+msgstr "普通"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -438,19 +438,19 @@ msgstr "项目任务类型"
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr "已计划时间"
+msgstr "已计划的时间"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 #: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr "工作任务"
+msgstr "任务工作"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Hours"
-msgstr "小时"
+msgstr "小时数"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
@@ -485,7 +485,7 @@ msgstr "我的项目"
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
 msgid "Estimated time to close this task by the delegated user."
-msgstr "关闭这授权用户的任务估计时间"
+msgstr "委托用户结束这任务的估计时间"
 
 #. module: project
 #: selection:project.project,state:0
@@ -538,7 +538,7 @@ msgstr "用户：%(user_id)s"
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr "延迟时间"
+msgstr "延迟的小时数"
 
 #. module: project
 #: field:project.project,contact_id:0
@@ -554,7 +554,7 @@ msgstr "委派"
 #. module: project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
+msgstr "无效的视图结构xml文件"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
@@ -589,7 +589,7 @@ msgstr "新任务"
 #. module: project
 #: help:project.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr "时间表工作小时数甘特图"
+msgstr "时间表工作时间调整甘特图报表"
 
 #. module: project
 #: view:project.project:0
@@ -693,7 +693,7 @@ msgstr "状态"
 msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed."
-msgstr "你自己任务的新状态.未决的项目将被自动重新委派任务是关闭的."
+msgstr "你任务的新状态.未决的任务将会自动重新开始.委派的任务结束."
 
 #. module: project
 #: field:res.company,project_time_mode:0
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index 9f7837bdadb..d9b05aebafc 100644
--- a/addons/project/i18n/zh_TW.po
+++ b/addons/project/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 867c134198b..86f10e46b97 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -25,7 +25,7 @@
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Scheduling"/>
                                 <field name="priority"/>
-                                <field name="active" select="2"/>
+                                <field name="active"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Performance"/>
@@ -57,7 +57,7 @@
                         </page>
                         <page groups="base.group_extended" string="Partner Info">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" select="2"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="contact_id"/>
                             <field name="warn_customer"/>
                             <newline/>
                             <separator colspan="2" string="Mail Header"/>
@@ -110,11 +110,11 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects"/>
+                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" name="open"/>
                        <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
-                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
+                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." name="member"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Templates" domain="[('state','=','template')]" help="Template Projects"/>
                        <separator orientation="vertical"/>
@@ -152,7 +152,7 @@
             <field name="view_type">form</field>
             <field name="domain">[]</field>
             <field name="view_id" ref="view_project"/>
-            <field name="context">{"search_default_Current":1,"search_default_Member":1}</field>
+            <field name="context">{"search_default_open":1,"search_default_member":1}</field>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
         <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
@@ -234,7 +234,7 @@
                         <field name="name" select="1"/>
                         <field name="project_id" required="1" select="1" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                         <field name="total_hours" widget="float_time"/>
-                        <field name="date_deadline" select="2"/>
+                        <field name="date_deadline"/>
                         <field name="user_id" select="1"/>
                         <field name="progress" widget="progressbar"/>
                     </group>
@@ -246,15 +246,15 @@
                                 widget="float_time"
                                 attrs="{'readonly':[('state','!=','draft')]}"
                                 on_change="onchange_planned(planned_hours, effective_hours)"/>
-                                <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
-                                <button name="%(action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
+                                <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
+                                <button name="%(action_config_compute_remaining)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                             </group>
                             <group col="2" colspan="2">
                             <field name="delay_hours" widget="float_time"/>
                             <field name="effective_hours" widget="float_time"/>
                             </group>
 
-                            <field colspan="4" name="description" nolabel="1" select="2"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
+                            <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
                             <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
@@ -270,7 +270,7 @@
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
                                 <button name="%(action_config_compute_remaining)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-                                <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
+                                <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                 <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-jump-to"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
@@ -304,14 +304,14 @@
                                 <field name="date_end"/>
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
-                            <field name="partner_id" select="2"/>
+                            <field name="partner_id"/>
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <group col="4" colspan="2">
                                 <field name="type" widget="selection" />
                                 <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                                 <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                             </group>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
@@ -349,7 +349,7 @@
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                    <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
+                    <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
                     <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-jump-to" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>
@@ -403,7 +403,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" name="current"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
                         <separator orientation="vertical"/>
@@ -414,7 +414,7 @@
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
-                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" string="My Task"/>
+                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" name="my_task"/>
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
@@ -440,7 +440,7 @@
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
-            <field name="context">{"search_default_Current":1,"search_default_My Task":1}</field>
+            <field name="context">{"search_default_current":1,"search_default_my_task":1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
@@ -571,7 +571,7 @@
                         <field name="subject" select="1"/>
                         <field name="project_id"/>
                         <field name="user_id" select="1"/>
-                          <field name="date" select="2"/>
+                          <field name="date"/>
                      </group>
                         <separator string="Description"  colspan="4"/>
                         <field name="description"  nolabel="1" colspan="4"/>
@@ -607,7 +607,7 @@
                        <field name="subject"/>
                        <field name="project_id" select="1" widget="selection"/>
                        <field name="user_id" select="1" widget="selection">
-                           <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" string="My Msg"/>
+                           <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" name="my_msg"/>
                        </field>
                    </group>
                    <newline/>
@@ -626,11 +626,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_project_message_tree"/>
-            <field name="context">{"search_default_My Msg":1}</field>
+            <field name="context">{"search_default_my_msg":1}</field>
             <field name="search_view_id" ref="view_project_message_search"/>
        </record>
 
-        <!--<menuitem id="menu_message_main" name="Message" parent="base.menu_main_pm"/>-->
         <menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_project_management" sequence="11"/>
 
         <act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml
index 934fa57ee9c..25001605210 100644
--- a/addons/project/project_wizard.xml
+++ b/addons/project/project_wizard.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <!--<wizard id="wizard_close_task" menu="False" model="project.task" name="project.task.close" string="Close Task"/>-->
-        <wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>
+        <!--<wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>-->
         <!--<wizard
             id="wizard_duplicate_template"
             menu="False"
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index bd276e175cc..09a4374b156 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -42,9 +42,9 @@
 	                    <separator orientation="vertical"/>
 	                    <field name="project_id"/>
 	                    <field name="user_id" widget="selection">
-	                        <filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]"/>
+	                        <filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" name="my_task"/>
 	                    </field>
-                    </group>
+                    </group>                    
                     <newline/>
                     <group expand="1" string="Group By...">
                         <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
@@ -64,7 +64,7 @@
             <field name="res_model">report.project.task.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
-            <field name="context">{"search_default_My Task":1}</field>
+            <field name="context">{"search_default_my_task":1}</field>            
             <field name="search_view_id" ref="view_task_project_user_search"/>
         </record>
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index 6d48d9d45dd..618eecf4b62 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import project_close_task
-import task_delegate
+import project_task_delegate
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py
deleted file mode 100644
index 9c81aefca1e..00000000000
--- a/addons/project/wizard/compute_tasks_date.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.translate import _
-import datetime
-from resource.faces import *
-from new import classobj
-import operator
-import project.project_resource as proj
-
-compute_form = """<?xml version="1.0" ?>
-<form string="Compute Scheduling of Tasks">
-    <field name="project_id" colspan="4"/>
-</form>"""
-
-success_msg = """<?xml version="1.0" ?>
-<form string="Compute Scheduling of Tasks">
-    <label string="Task Scheduling completed successfully."/>
-</form>"""
-
-compute_fields = {
-    'project_id': {'string':'Project', 'type':'many2one', 'relation': 'project.project', 'required':'True'},
-}
-
-class wizard_compute_tasks(wizard.interface):
-
-    def _compute_date(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        project_pool = pool.get('project.project')
-        task_pool = pool.get('project.task')
-        resource_pool = pool.get('resource.resource')
-        user_pool = pool.get('res.users')
-        project_id = data['form']['project_id']
-        project = project_pool.browse(cr,uid,project_id)
-        task_ids = task_pool.search(cr,uid,[('project_id','=',project_id),('state','in',['draft','open','pending'])])
-        if task_ids:
-            wktime_cal = []
-            task_ids.sort()
-            task_obj = task_pool.browse(cr,uid,task_ids)
-            calendar_id = project.resource_calendar_id.id
-            start_date = project.date_start
-            if not project.date_start:
-                start_date = datetime.datetime.now().strftime("%Y-%m-%d")
-            date_start = datetime.datetime.strftime(datetime.datetime.strptime(start_date,"%Y-%m-%d"),"%Y-%m-%d %H:%M")
-
-#    To create resources which are the Project Members
-            resource_objs = []
-            for resource in project.members:
-                leaves = []
-                resource_id = resource_pool.search(cr,uid,[('user_id','=',resource.id)])
-                if resource_id:
-                    resource_obj = resource_pool.browse(cr,uid,resource_id)[0]
-                    leaves = proj.leaves_resource(cr,uid,calendar_id or False ,resource_id,resource_obj.calendar_id.id)
-                    resource_objs.append(classobj(str(resource.name),(Resource,),{'__doc__':resource.name,'__name__':resource.name,'vacation':tuple(leaves),'efficiency':resource_obj.time_efficiency}))
-
-            priority_dict = {'0':1000,'1':800,'2':500,'3':300,'4':100}
-
-#     To create dynamic no of tasks with the resource specified
-            def tasks_resource(j,eff,priorty = 500,obj=None):
-                def task():
-                    """
-                    task is a dynamic method!
-                    """
-                    effort = eff
-                    if obj:
-                        resource = obj
-                    priority = priorty
-                task.__doc__ = "TaskNO%d" %j
-                task.__name__ = "task%d" %j
-                return task
-
-#    Creating the project with all the tasks and resources
-            def Project():
-                title = project.name
-                start = date_start
-                resource = reduce(operator.or_,resource_objs)
-                minimum_time_unit = 1
-
-#    If project has calendar
-                if calendar_id:
-                    working_days = proj.compute_working_calendar(cr,uid,calendar_id)
-                    vacation = tuple(proj.leaves_resource(cr,uid,calendar_id))
-
-#    Dynamic Creation of tasks
-                i = 0
-                for each_task in task_obj:
-                    hours = str(each_task.planned_hours / each_task.occupation_rate)+ 'H'
-                    if each_task.priority in priority_dict.keys():
-                        priorty = priority_dict[each_task.priority]
-                    if each_task.user_id:
-                       for resource_object in resource_objs:
-                            if resource_object.__name__ == each_task.user_id.name:
-                               task = tasks_resource(i,hours,priorty,resource_object)
-                    else:
-                        task = tasks_resource(i,hours,priorty)
-                    i += 1
-
-#    Writing back the dates
-            project = BalancedProject(Project)
-            loop_no = 0
-            for t in project:
-                s_date = t.start.to_datetime()
-                e_date = t.end.to_datetime()
-                if loop_no == 0:
-                    project_pool.write(cr,uid,[project_id],{'date':e_date})
-                else:
-                    user_id = user_pool.search(cr,uid,[('name','=',t.booked_resource[0].__name__)])
-                    task_pool.write(cr,uid,[task_obj[loop_no-1].id],{'date_start':s_date.strftime('%Y-%m-%d %H:%M:%S'),'date_deadline':e_date.strftime('%Y-%m-%d %H:%M:%S'),'user_id':user_id[0]})
-                loop_no +=1
-        return {}
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':compute_form, 'fields':compute_fields, 'state':[
-                ('end', 'Cancel', 'gtk-cancel'),
-                ('compute', 'Compute', 'gtk-ok', True)
-            ]},
-        },
-
-
-        'compute': {
-            'actions': [_compute_date],
-            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok', 'gtk-ok', True)]},
-        }
-    }
-wizard_compute_tasks('wizard.compute.tasks')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
new file mode 100644
index 00000000000..adfddcd8fd9
--- /dev/null
+++ b/addons/project/wizard/project_task_delegate.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from tools.translate import _
+from osv import fields, osv
+
+class project_task_delegate(osv.osv_memory):
+    _name = 'project.task.delegate'
+    _description = 'Task Delegate'
+
+    _columns = {
+        'name': fields.char('Delegated Title', size=64, required=True, help="New title of the task delegated to the user"),
+        'prefix': fields.char('Your Task Title', size=64, required=True, help="New title of your own task to validate the work done"),
+        'user_id': fields.many2one('res.users', 'Assign To', required=True, help="User you want to delegate this task to"),
+        'new_task_description': fields.text('New Task Description', help="Reinclude the description of the task in the task of the user"),
+        'planned_hours': fields.float('Planned Hours',  help="Estimated time to close this task by the delegated user"),
+        'planned_hours_me': fields.float('Hours to Validate', required=True, help="Estimated time for you to validate the work done by the user to whom you delegate this task"),
+        'state': fields.selection([('pending','Pending'),
+                                   ('done','Done'),
+                                     ],'Validation State', required=True, help="New state of your own task. Pending will be reopened automatically when the delegated task is closed"),
+            }
+
+    def _get_name(self, cr, uid, context={}):
+        if 'active_id' in context:
+            task = self.pool.get('project.task').browse(cr, uid, context['active_id'])
+            if task.name.startswith(_('CHECK: ')):
+                newname = task.name.strip(_('CHECK: '))
+            else:
+                newname = task.name or ''
+            return newname
+        return ''
+
+    def _get_plan_hour(self, cr, uid, context={}):
+        if 'active_id' in context:
+            task = self.pool.get('project.task').browse(cr, uid, context['active_id'])
+            return task.remaining_hours
+        return 0.0
+
+    def _get_prefix(self, cr, uid, context={}):
+        if 'active_id' in context:
+            task = self.pool.get('project.task').browse(cr, uid, context['active_id'])
+            if task.name.startswith(_('CHECK: ')):
+                newname = task.name.strip(_('CHECK: '))
+            else:
+                newname = task.name or ''
+            return _('CHECK: ')+ newname
+        return ''
+
+    def _get_new_desc(self, cr, uid, context={}):
+        if 'active_id' in context:
+            task = self.pool.get('project.task').browse(cr, uid, context['active_id'])
+            return task.description
+        return ''
+
+    _defaults = {
+       'name': _get_name,
+       'planned_hours': _get_plan_hour,
+       'planned_hours_me': 1.0,
+       'prefix': _get_prefix,
+       'new_task_description': _get_new_desc,
+       'state': 'pending',
+               }
+
+    def validate(self, cr, uid, ids, context={}):
+        task_obj = self.pool.get('project.task')
+        delegate_data = self.read(cr, uid, ids, context=context)[0]
+        task = task_obj.browse(cr, uid, context['active_id'], context=context)
+        newname = delegate_data['prefix'] or ''
+        new_task_id = task_obj.copy(cr, uid, task.id, {
+            'name': delegate_data['name'],
+            'user_id': delegate_data['user_id'],
+            'planned_hours': delegate_data['planned_hours'],
+            'remaining_hours': delegate_data['planned_hours'],
+            'parent_ids': [(6, 0, [task.id])],
+            'state': 'open',
+            'description': delegate_data['new_task_description'] or '',
+            'child_ids': [],
+            'work_ids': []
+        })
+        task_obj.write(cr, uid, [task.id], {
+            'remaining_hours': delegate_data['planned_hours_me'],
+            'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0),
+            'name': newname,
+        })
+        if delegate_data['state'] == 'pending':
+            task_obj.do_pending(cr, uid, [task.id])
+        else:
+            task_obj.do_close(cr, uid, [task.id])
+        return {}
+
+project_task_delegate()
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
new file mode 100644
index 00000000000..65478e74f0b
--- /dev/null
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_project_task_delegate" model="ir.ui.view">
+            <field name="name">Project Task Delegate</field>
+            <field name="model">project.task.delegate</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="Project Task Delegate">
+	                  <separator string="Delegated Task" colspan="4"/>
+		              <field name="user_id"/>
+		              <newline/>
+		              <field name="planned_hours" widget="float_time"/>
+		              <newline/>
+		              <field name="name"/>
+		              <newline/>
+		              <field name="new_task_description"/>
+		              <newline/>
+		              <separator string="Validation Task" colspan="4"/>
+		              <field name="planned_hours_me"  widget="float_time"/>
+		              <newline/>
+		              <field name="prefix" />
+		              <newline/>
+		              <field name="state" />
+		              <newline/>
+		              <group colspan="4" col="6">
+		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		            		<button icon="gtk-ok" name="validate" string="Validate" type="object"/>
+		              </group>
+			  	</form>
+            </field>
+		</record>
+
+		<record id="action_project_task_delegate" model="ir.actions.act_window">
+	           <field name="name">Project Task Delegate</field>
+	           <field name="type">ir.actions.act_window</field>
+	           <field name="res_model">project.task.delegate</field>
+	           <field name="view_type">form</field>
+	           <field name="view_mode">form</field>
+	           <field name="view_id" ref="view_project_task_delegate"/>
+		       <field name="context">{'record_id' : active_id}</field>
+	           <field name="target">new</field>
+    	</record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
deleted file mode 100644
index 0fe662dc3cb..00000000000
--- a/addons/project/wizard/task_delegate.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-from tools import email_send as email
-import pooler
-from tools.translate import _
-
-ask_form = """<?xml version="1.0" ?>
-<form string="Delegate this task to a user">
-    <separator string="Delegated Task" colspan="4"/>
-    <field name="user_id" colspan="4"/>
-    <field name="planned_hours" colspan="4" widget="float_time"/>
-    <field name="name" colspan="4"/>
-    <field name="new_task_description"/>
-    <separator string="Validation Task" colspan="4"/>
-    <field name="planned_hours_me" colspan="4" widget="float_time"/>
-    <field name="prefix" colspan="4"/>
-    <field name="state" colspan="4"/>
-</form>"""
-
-ask_fields = {
-    'name': {'string': 'Delegated Title', 'type': 'char', 'required': 'True', 'size':64, 'help':"New title of the task delegated to the user."},
-    'prefix': {'string': 'Your Task Title', 'type': 'char', 'required': 'True', 'size':64, 'help':"New title of your own task to validate the work done."},
-    'user_id': {'string':'Assign To', 'type':'many2one', 'relation': 'res.users', 'required':'True', 'help':"User you want to delegate this task to."},
-    'new_task_description': {'string':'New Task Description', 'type':'text', 'help':"Reinclude the description of the task in the task of the user."},
-    'planned_hours': {'string':'Planned Hours', 'type':'float', 'widget':'float_time', 'help':"Estimated time to close this task by the delegated user."},
-    'planned_hours_me': {'string':'Hours to Validate', 'type':'float', 'widget':'float_time', 'help':"Estimated time for you to validate the work done by the user to whom you delegate this task."},
-    'state': {'string':'Validation State', 'type':'selection', 'selection': [('pending','Pending'),('done','Done')], 'help':"New state of your own task. Pending will be reopened automatically when the delegated task is closed.", 'required':True},
-}
-
-class wizard_delegate(wizard.interface):
-    def _do_assign(self, cr, uid, data, context):
-        task_obj = pooler.get_pool(cr.dbname).get('project.task')
-        task = task_obj.browse(cr, uid, data['id'], context)
-        newname = data['form']['prefix'] or ''
-        new_task_id = task_obj.copy(cr, uid, data['id'], {
-            'name': data['form']['name'],
-            'user_id': data['form']['user_id'],
-            'planned_hours': data['form']['planned_hours'],
-            'remaining_hours': data['form']['planned_hours'],
-            'parent_ids': [(6, 0, [data['id']])],
-            'state': 'open',
-            'description': data['form']['new_task_description'] or '',
-            'child_ids': [],
-            'work_ids': []
-        })
-        task_obj.write(cr, uid, [data['id']], {
-            'remaining_hours': data['form']['planned_hours_me'],
-            'planned_hours': data['form']['planned_hours_me'] + (task.effective_hours or 0.0),
-            'name': newname,
-        })
-        if data['form']['state']=='pending':
-            task_obj.do_pending(cr, uid, [data['id']])
-        else:
-            task_obj.do_close(cr, uid, [data['id']])
-        return {}
-
-    def _ask_auto_complete(self, cr, uid, data, context):
-        task_obj = pooler.get_pool(cr.dbname).get('project.task')
-        task = task_obj.browse(cr, uid, data['id'], context)
-        if task.name.startswith(_('CHECK: ')):
-            newname = task.name.strip(_('CHECK: '))
-        else:
-            newname = task.name or ''
-        return {
-            'name': newname,
-            'user_id': False,
-            'planned_hours': task.remaining_hours,
-            'planned_hours_me': 1.0,
-            'prefix': _('CHECK: ')+ newname,
-            'new_task_description': task.description,
-            'state': 'pending'
-        }
-
-    states = {
-        'init': {
-            'actions': [_ask_auto_complete],
-            'result': {'type':'form', 'arch':ask_form, 'fields':ask_fields, 'state':[
-                ('end', 'Cancel'),
-                ('valid', 'Validate', '', True)
-            ]},
-        },
-        'valid': {
-            'actions': [_do_assign],
-            'result': {'type':'state', 'state':'end'},
-        }
-    }
-wizard_delegate('project.task.delegate')
diff --git a/addons/project_caldav/__terp__.py b/addons/project_caldav/__openerp__.py
similarity index 92%
rename from addons/project_caldav/__terp__.py
rename to addons/project_caldav/__openerp__.py
index 1ac69933623..b3e0be57cad 100644
--- a/addons/project_caldav/__terp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -28,8 +28,7 @@
     "depends" : ["project", "caldav", "base_calendar"],
     "init_xml" : ["project_caldav_data.xml"],
     "demo_xml" : [],
-    "update_xml" : ["project_caldav_view.xml",
-                                "project_caldav_wizard.xml"],
+    "update_xml" : ["project_caldav_view.xml"],
     "active": False,
     "website": "http://www.openerp.com",
     "installable": True,
diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index 53bd5545159..ff70478298e 100644
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,14 +26,15 @@ class project_task(osv.osv):
     _name = "project.task"
     _inherit = ["calendar.todo", "project.task"]
     _columns = {
-                'attendee_ids': fields.many2many('calendar.attendee', \
-                    'task_attendee_rel', 'task_id', 'attendee_id', 'Attendees'),
+        'attendee_ids': fields.many2many('calendar.attendee', \
+                                         'task_attendee_rel', 'task_id', 'attendee_id', 'Attendees'),
                 }
-    def import_cal(self, cr, uid, data, data_id=None, context={}):
+
+    def import_cal(self, cr, uid, data, data_id=None, context=None):
         todo_obj = self.pool.get('basic.calendar.todo')
         vals = todo_obj.import_cal(cr, uid, data, context=context)
         return self.check_import(cr, uid, vals, context=context)
-    
+
     def check_import(self, cr, uid, vals, context={}):
         ids = []
         for val in vals:
@@ -61,7 +62,7 @@ class project_task(osv.osv):
                 task_id = self.create(cr, uid, val)
                 ids.append(task_id)
         return ids
-        
+
     def export_cal(self, cr, uid, ids, context={}):
         task_datas = self.read(cr, uid, ids, [], context ={'read': True})
         tasks = []
@@ -75,7 +76,6 @@ class project_task(osv.osv):
         calendar_val = calendar_val.replace('"', '').strip()
         return calendar_val
 
-
 project_task()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_caldav/project_caldav_wizard.xml b/addons/project_caldav/project_caldav_wizard.xml
deleted file mode 100644
index 2bb677eea46..00000000000
--- a/addons/project_caldav/project_caldav_wizard.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<openerp>
-	<data>
-		<wizard string="Import .ics File" model="project.task"
-			name="calendar.event.import" id="caldav.wizard_cal_event_import" />
-
-		<wizard string="Subscribe"
-			model="project.task" name="calendar.event.subscribe"
-			id="caldav.wizard_cal_event_subscribe" />
-
-		<wizard string="Export .ics File" model="project.task"
-			name="calendar.event.export" id="caldav.wizard_cal_event_export" />
-
-		<wizard string="Edit this event" model="project.task"
-			name="calendar.event.edit.this" id="caldav.wizard_edit_this_event"
-			menu="False" />
-
-	</data>
-</openerp>
diff --git a/addons/project_gtd/__terp__.py b/addons/project_gtd/__openerp__.py
similarity index 93%
rename from addons/project_gtd/__terp__.py
rename to addons/project_gtd/__openerp__.py
index 47531886575..7c8dc035e0f 100644
--- a/addons/project_gtd/__terp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -45,6 +45,9 @@ performing those tasks.
         'project_gtd_view.xml',
         'project_gtd_wizard.xml',
         'security/ir.model.access.csv',
+        'wizard/project_gtd_empty_view.xml',
+        'wizard/project_gtd_daily_view.xml',
+        'wizard/project_gtd_fill_view.xml',
     ],
     'demo_xml': ['project_gtd_demo.xml'],
     'installable': True,
diff --git a/addons/project_gtd/i18n/ar.po b/addons/project_gtd/i18n/ar.po
index 97a2250fbf8..9b363766268 100644
--- a/addons/project_gtd/i18n/ar.po
+++ b/addons/project_gtd/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/bg.po b/addons/project_gtd/i18n/bg.po
index f449fb4e181..86d6b8d952a 100644
--- a/addons/project_gtd/i18n/bg.po
+++ b/addons/project_gtd/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/bs.po b/addons/project_gtd/i18n/bs.po
index e4260e41ea6..642e95d35dc 100644
--- a/addons/project_gtd/i18n/bs.po
+++ b/addons/project_gtd/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ca.po b/addons/project_gtd/i18n/ca.po
index c86d3e30b71..f54651348aa 100644
--- a/addons/project_gtd/i18n/ca.po
+++ b/addons/project_gtd/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/cs.po b/addons/project_gtd/i18n/cs.po
index 7e62010af5f..12a12079427 100644
--- a/addons/project_gtd/i18n/cs.po
+++ b/addons/project_gtd/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index c24fb255d6a..ed881221078 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/el.po b/addons/project_gtd/i18n/el.po
index b381e63a01b..379f359944e 100644
--- a/addons/project_gtd/i18n/el.po
+++ b/addons/project_gtd/i18n/el.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/project_gtd/i18n/es.po b/addons/project_gtd/i18n/es.po
index fe128ae393d..ec0bbde2a50 100644
--- a/addons/project_gtd/i18n/es.po
+++ b/addons/project_gtd/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/es_AR.po b/addons/project_gtd/i18n/es_AR.po
index a69c7f53969..6960d40bc3e 100644
--- a/addons/project_gtd/i18n/es_AR.po
+++ b/addons/project_gtd/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/et.po b/addons/project_gtd/i18n/et.po
index 57ee612a752..92053020f2b 100644
--- a/addons/project_gtd/i18n/et.po
+++ b/addons/project_gtd/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/fi.po b/addons/project_gtd/i18n/fi.po
index da633e3c5dd..e3be2a76df8 100644
--- a/addons/project_gtd/i18n/fi.po
+++ b/addons/project_gtd/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/fr.po b/addons/project_gtd/i18n/fr.po
index 3772f5953a2..27f868fbae5 100644
--- a/addons/project_gtd/i18n/fr.po
+++ b/addons/project_gtd/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/hr.po b/addons/project_gtd/i18n/hr.po
index 4c5c2ab7cc6..5456625f6b8 100644
--- a/addons/project_gtd/i18n/hr.po
+++ b/addons/project_gtd/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/project_gtd/i18n/hu.po b/addons/project_gtd/i18n/hu.po
index 97a2250fbf8..9b363766268 100644
--- a/addons/project_gtd/i18n/hu.po
+++ b/addons/project_gtd/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/id.po b/addons/project_gtd/i18n/id.po
index fd66ae1ced5..51098eee4cc 100644
--- a/addons/project_gtd/i18n/id.po
+++ b/addons/project_gtd/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/it.po b/addons/project_gtd/i18n/it.po
index da3cc189f9e..b6da96894db 100644
--- a/addons/project_gtd/i18n/it.po
+++ b/addons/project_gtd/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ko.po b/addons/project_gtd/i18n/ko.po
index eac88f9aa78..65a61e103e3 100644
--- a/addons/project_gtd/i18n/ko.po
+++ b/addons/project_gtd/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/lt.po b/addons/project_gtd/i18n/lt.po
index 97a2250fbf8..58880334a31 100644
--- a/addons/project_gtd/i18n/lt.po
+++ b/addons/project_gtd/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/nl.po b/addons/project_gtd/i18n/nl.po
index 5baf27a745f..9e1c6378df5 100644
--- a/addons/project_gtd/i18n/nl.po
+++ b/addons/project_gtd/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/nl_BE.po b/addons/project_gtd/i18n/nl_BE.po
index a38fe78431e..8b81b450f58 100644
--- a/addons/project_gtd/i18n/nl_BE.po
+++ b/addons/project_gtd/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index b5c55c854ea..068c42bee8d 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/pt.po b/addons/project_gtd/i18n/pt.po
index 8442748224c..dc608703161 100644
--- a/addons/project_gtd/i18n/pt.po
+++ b/addons/project_gtd/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index 99dbc341d27..45f16a73cbd 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ro.po b/addons/project_gtd/i18n/ro.po
index 97a2250fbf8..58880334a31 100644
--- a/addons/project_gtd/i18n/ro.po
+++ b/addons/project_gtd/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/ru.po b/addons/project_gtd/i18n/ru.po
index 9fb06436326..a268bd5e705 100644
--- a/addons/project_gtd/i18n/ru.po
+++ b/addons/project_gtd/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/sl.po b/addons/project_gtd/i18n/sl.po
index 72c23d6b35e..0107247be3b 100644
--- a/addons/project_gtd/i18n/sl.po
+++ b/addons/project_gtd/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/sv.po b/addons/project_gtd/i18n/sv.po
index a7814dcd3a6..95ea5c82414 100644
--- a/addons/project_gtd/i18n/sv.po
+++ b/addons/project_gtd/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/tlh.po b/addons/project_gtd/i18n/tlh.po
index 5ca56004437..bb8a6a022b1 100644
--- a/addons/project_gtd/i18n/tlh.po
+++ b/addons/project_gtd/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index e7a4376b4d7..d579b8b9dfa 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/uk.po b/addons/project_gtd/i18n/uk.po
index c3a09dfc834..a490f487d59 100644
--- a/addons/project_gtd/i18n/uk.po
+++ b/addons/project_gtd/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index faa7c008d52..408679949f6 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/zh_TW.po b/addons/project_gtd/i18n/zh_TW.po
index fb972907511..e8fc13e2f8f 100644
--- a/addons/project_gtd/i18n/zh_TW.po
+++ b/addons/project_gtd/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index d53391d620b..d45576cabb1 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -62,58 +62,58 @@ class project_gtd_timebox(osv.osv):
         'icon': fields.selection(tools.icons, 'Icon', size=64),
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(project_gtd_timebox,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        if (res['type']=='form') and ('record_id' in context):
-            if context['record_id']:
-                rec = self.browse(cr, uid, int(context['record_id']), context)
-            else:
-                iids = self.search(cr,uid, [('user_id','=',uid),('parent_id','=',False)], context=context)
-                if len(iids):
-                    rec = self.browse(cr, uid, int(iids[0]), context=context)
-                else:
-                    return res
-            res['arch'] = """
-    <form string="Daily Timebox">
-        <field name="name" readonly="1"/>
-        <notebook position="top">
-            """
-            for i in range(1,7):
-                if not getattr(rec, 'context%d_id'%i):
-                    continue
-                res['arch']+= """
-            <page string="%s">
-                <field name="%s" colspan="4" nolabel="1">
-                    <tree editable="bottom" colors="grey:state in ('done','pending');red:state=='cancelled'" string="Tasks">
-                        <field name="name"/>
-                """ % (getattr(rec, 'context%d_id'%(i,)).name.encode('utf-8'), 'task%d_ids'%(i,))
-                if rec.col_project:
-                    res['arch'] += '<field name="project_id" required="1"/>\n'
-                if rec.col_date_start:
-                    res['arch'] += '<field name="date_start"/>\n'
-                if rec.col_priority:
-                    res['arch'] += '<field name="priority"/>\n'
-                if rec.col_deadline:
-                    res['arch'] += '<field name="date_deadline"/>\n'
-                if rec.col_planned_hours:
-                    res['arch'] += '<field name="planned_hours"  widget="float_time" sum="Est. Hours"/>\n'
-                if rec.col_effective_hours:
-                    res['arch'] += '<field name="effective_hours"  widget="float_time" sum="%s"/>\n' % (_('Eff. Hours'),)
-                res['arch'] += """
-                        <field name="state" readonly="1"/>
-                    </tree>
-                </field>
-            </page>
-                """
-            res['arch']+="""
-        </notebook>
-    </form>
-            """
-        doc = etree.XML(res['arch'])
-        xarch, xfields = self._view_look_dom_arch(cr, uid, doc, view_id, context=context)
-        res['arch'] = xarch
-        res['fields'] = xfields
-        return res
+#    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+#        res = super(project_gtd_timebox,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+#        if (res['type']=='form') and ('record_id' in context):
+#            if context['record_id']:
+#                rec = self.browse(cr, uid, int(context['record_id']), context)
+#            else:
+#                iids = self.search(cr,uid, [('user_id','=',uid),('parent_id','=',False)], context=context)
+#                if len(iids):
+#                    rec = self.browse(cr, uid, int(iids[0]), context=context)
+#                else:
+#                    return res
+#            res['arch'] = """
+#    <form string="Daily Timebox">
+#        <field name="name" readonly="1"/>
+#        <notebook position="top">
+#            """
+#            for i in range(1,7):
+#                if not getattr(rec, 'context%d_id'%i):
+#                    continue
+#                res['arch']+= """
+#            <page string="%s">
+#                <field name="%s" colspan="4" nolabel="1">
+#                    <tree editable="bottom" colors="grey:state in ('done','pending');red:state=='cancelled'" string="Tasks">
+#                        <field name="name"/>
+#                """ % (getattr(rec, 'context%d_id'%(i,)).name.encode('utf-8'), 'task%d_ids'%(i,))
+#                if rec.col_project:
+#                    res['arch'] += '<field name="project_id" required="1"/>\n'
+#                if rec.col_date_start:
+#                    res['arch'] += '<field name="date_start"/>\n'
+#                if rec.col_priority:
+#                    res['arch'] += '<field name="priority"/>\n'
+#                if rec.col_deadline:
+#                    res['arch'] += '<field name="date_deadline"/>\n'
+#                if rec.col_planned_hours:
+#                    res['arch'] += '<field name="planned_hours"  widget="float_time" sum="Est. Hours"/>\n'
+#                if rec.col_effective_hours:
+#                    res['arch'] += '<field name="effective_hours"  widget="float_time" sum="%s"/>\n' % (_('Eff. Hours'),)
+#                res['arch'] += """
+#                        <field name="state" readonly="1"/>
+#                    </tree>
+#                </field>
+#            </page>
+#                """
+#            res['arch']+="""
+#        </notebook>
+#    </form>
+#            """
+#        doc = etree.XML(res['arch'])
+#        xarch, xfields = self._view_look_dom_arch(cr, uid, doc, view_id, context=context)
+#        res['arch'] = xarch
+#        res['fields'] = xfields
+#        return res
 
 project_gtd_timebox()
 
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 6e43f96b1ab..b4ee058433a 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -90,7 +90,7 @@
         <field name="inherit_id" ref="project.view_task_form2" />
         <field name="arch" type="xml">
             <field name="progress" position="after">
-                <field name="context_id" select="2" widget="selection" groups="project_gtd.group_project_getting"/>
+                <field name="context_id" widget="selection" groups="project_gtd.group_project_getting"/>
                 <field name="timebox_id" select="1" groups="project_gtd.group_project_getting"/>
             </field>
         </field>
diff --git a/addons/project_gtd/project_gtd_wizard.xml b/addons/project_gtd/project_gtd_wizard.xml
index f6b9f7597be..e01db8218c6 100644
--- a/addons/project_gtd/project_gtd_wizard.xml
+++ b/addons/project_gtd/project_gtd_wizard.xml
@@ -2,26 +2,26 @@
 <openerp>
 	<data>
 
-		<wizard string="My Daily Timebox"
+		<!--<wizard string="My Daily Timebox"
 			model="project.gtd.timebox"
 			name="project.gtd.timebox.daily"
-			id="open_gtd_timebox_daily"/>
+			id="open_gtd_timebox_daily"/>-->
 
 <!--		<menuitem name="My Daily Timebox" id="menu_open_time_daily_inbox" -->
 <!--				parent="menu_open_time" action="open_gtd_timebox_daily"-->
 <!--				 icon="STOCK_JUSTIFY_FILL" type="wizard"/>-->
-				 
-		<wizard string="Plannify Timebox"
+
+	<!--	<wizard string="Plannify Timebox"
 			model="project.gtd.timebox"
 			name="project.gtd.timebox.fill"
 			id="open_gtd_timebox_fill"/>
 
-
-		<wizard string="Empty Timebox"
+-->
+		<!--<wizard string="Empty Timebox"
 			model="project.gtd.timebox"
 			name="project.gtd.timebox.empty"
 			id="open_gtd_timebox_empty"/>
-
+-->
 
 	</data>
 </openerp>
diff --git a/addons/project_gtd/wizard/project_gtd_daily.py b/addons/project_gtd/wizard/project_gtd_daily.py
index 68b2a0d8ce3..bacc1af85d9 100644
--- a/addons/project_gtd/wizard/project_gtd_daily.py
+++ b/addons/project_gtd/wizard/project_gtd_daily.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,32 +15,28 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-
-import wizard
-import netsvc
-import time
-import pooler
-from osv import osv
+from osv import osv, fields
 from tools.translate import _
 
-class wiz_timebox_open(wizard.interface):
-    def _open_timebox(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        ids = pool.get('project.gtd.timebox').search(cr, uid, [])
+class project_timebox_open(osv.osv_memory):
+
+    _name = 'project.timebox.open'
+    _description = 'Project Timebox Open'
+
+    def open_tb(self, cr, uid, data, context=None):
+        ids = self.pool.get('project.gtd.timebox').search(cr, uid, [])
         if not len(ids):
-            raise wizard.except_wizard(_('Error !'), _('No timebox of the type "%s" defined !') % (tbtype,))
-        view_type = 'form,tree'
+            raise osv.except_osv(_('Error !'), _('No timebox of the type defined !'))
         if len(ids) >= 1:
             domain = "[('id','in',["+','.join(map(str, ids))+"])]"
         value = {
             'domain': domain,
             'name': 'My Daily Timebox',
             'view_type': 'form',
-            'view_mode': view_type,
+            'view_mode': 'form,tree',
             'res_model': 'project.gtd.timebox',
             'view_id': False,
             'type': 'ir.actions.act_window'
@@ -50,13 +46,6 @@ class wiz_timebox_open(wizard.interface):
             value['context'] = {'record_id':ids[0]}
         return value
 
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type':'action', 'action':_open_timebox, 'state':'end'}
-        }
-    }
-wiz_timebox_open('project.gtd.timebox.daily')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+project_timebox_open()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_gtd/wizard/project_gtd_daily_view.xml b/addons/project_gtd/wizard/project_gtd_daily_view.xml
new file mode 100644
index 00000000000..5b3e7d3d9e1
--- /dev/null
+++ b/addons/project_gtd/wizard/project_gtd_daily_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_project_gtd_daily" model="ir.ui.view">
+            <field name="name">My Daily Timebox</field>
+            <field name="model">project.timebox.open</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="My Daily Timebox">
+              		  <label string="You can open Daily Timebox"/>
+              		  <newline/>
+		              <group colspan="4" col="6">
+				            <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		              		<button name="open_tb" icon="gtk-ok" string="_Open Timebox" type="object" default_focus="1"/>
+		              </group>
+			  	</form>
+            </field>
+		</record>
+
+		<record id="action_project_gtd_daily" model="ir.actions.act_window">
+	           <field name="name">My Daily Timebox</field>
+	           <field name="type">ir.actions.act_window</field>
+	           <field name="res_model">project.timebox.open</field>
+	           <field name="view_type">form</field>
+	           <field name="view_mode">form</field>
+	           <field name="view_id" ref="view_project_gtd_daily"/>
+		       <field name="context">{'record_id' : active_id}</field>
+	           <field name="target">new</field>
+    	</record>
+
+    	<record model="ir.values" id="project_gtd_daily_values">
+            <field name="model_id" ref="model_project_gtd_timebox" />
+            <field name="object" eval="1" />
+            <field name="name">My Daily Timebox</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_project_gtd_daily'))" />
+            <field name="key">action</field>
+            <field name="model">project.gtd.timebox</field>
+        </record>
+
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/project_gtd/wizard/project_gtd_empty.py b/addons/project_gtd/wizard/project_gtd_empty.py
index a2ebe2e8dba..4eb4de12c12 100644
--- a/addons/project_gtd/wizard/project_gtd_empty.py
+++ b/addons/project_gtd/wizard/project_gtd_empty.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,46 +15,52 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-
-import wizard
-import netsvc
-import time
-import pooler
-from osv import osv
+from osv import osv, fields
 from tools.translate import _
 
-class wiz_timebox_empty(wizard.interface):
-    def _empty(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        ids = pool.get('project.gtd.timebox').search(cr, uid, [])
-        if not len(ids):
-            raise wizard.except_wizard(_('Error !'), _('No timebox child of this one !'))
-        tids = pool.get('project.task').search(cr, uid, [('timebox_id','=',data['id'])])
+class project_timebox_empty(osv.osv_memory):
+
+    _name = 'project.timebox.empty'
+    _description = 'Project Timebox Empty'
+    _columns = {
+        'name': fields.char('Name', size=32)
+                }
+
+    def view_init(self, cr , uid , fields_list, context=None):
+        if context is None:
+            context = {}
+        self._empty(cr, uid, context=context)
+        pass
+
+    def _empty(self, cr, uid, context=None):
         close = []
         up = []
-        for task in pool.get('project.task').browse(cr, uid, tids, context):
-            if (task.state in ('cancel','done')) or (task.user_id.id<>uid):
+        obj_tb = self.pool.get('project.gtd.timebox')
+        obj_task = self.pool.get('project.task')
+
+        if context is None:
+            context = {}
+        if not 'active_id' in context:
+            return {}
+
+        ids = obj_tb.search(cr, uid, [], context=context)
+        if not len(ids):
+            raise osv.except_osv(_('Error !'), _('No timebox child of this one !'))
+        tids = obj_task.search(cr, uid, [('timebox_id', '=', context['active_id'])])
+        for task in obj_task.browse(cr, uid, tids, context):
+            if (task.state in ('cancel','done')) or (task.user_id.id <> uid):
                 close.append(task.id)
             else:
                 up.append(task.id)
         if up:
-            pool.get('project.task').write(cr, uid, up, {'timebox_id':ids[0]})
+            obj_task.write(cr, uid, up, {'timebox_id':ids[0]})
         if close:
-            pool.get('project.task').write(cr, uid, close, {'timebox_id':False})
+            obj_task.write(cr, uid, close, {'timebox_id':False})
         return {}
 
-    states = {
-        'init' : {
-            'actions' : [_empty],
-            'result' : {'type':'state', 'state':'end'}
-        }
-    }
-wiz_timebox_empty('project.gtd.timebox.empty')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+project_timebox_empty()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml
new file mode 100644
index 00000000000..ef71ae72978
--- /dev/null
+++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_project_gtd_empty" model="ir.ui.view">
+            <field name="name">Empty Timebox</field>
+            <field name="model">project.timebox.empty</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="Empty Timebox">
+              		  <label string="Timebox Empty Process Completed Successfully."/>
+		              <group colspan="4" col="6">
+		            		<button  icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/>
+		              </group>
+			  	</form>
+            </field>
+		</record>
+
+		<record id="action_project_gtd_empty" model="ir.actions.act_window">
+	           <field name="name">Empty Timebox</field>
+	           <field name="type">ir.actions.act_window</field>
+	           <field name="res_model">project.timebox.empty</field>
+	           <field name="view_type">form</field>
+	           <field name="view_mode">form</field>
+	           <field name="view_id" ref="view_project_gtd_empty"/>
+		       <field name="context">{'record_id' : active_id}</field>
+	           <field name="target">new</field>
+    	</record>
+
+    	<record model="ir.values" id="project_gtd_empty_values">
+            <field name="model_id" ref="model_project_gtd_timebox" />
+            <field name="object" eval="1" />
+            <field name="name">Empty Timebox</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_project_gtd_empty'))" />
+            <field name="key">action</field>
+            <field name="model">project.gtd.timebox</field>
+        </record>
+
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index ca3964d34c5..8b39dac16ae 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -19,59 +19,43 @@
 #
 ##############################################################################
 
+from osv import osv, fields
 
-import wizard
-import pooler
-from osv import osv
+class project_timebox_fill(osv.osv_memory):
 
-_gtd_field = {
-    'task_ids': {'relation':'project.task', 'type':'many2many', 'string':'Tasks selection'},
-    'timebox_to_id': {'relation':'project.gtd.timebox', 'type':'many2one', 'string':'Set to Timebox'},
-    'timebox_id': {'relation':'project.gtd.timebox', 'type':'many2one', 'string':'Get from Timebox'}
-}
+    _name = 'project.timebox.fill.plan'
+    _description = 'Project Timebox Fill'
+    _columns = {
+        'timebox_id': fields.many2one('project.gtd.timebox', 'Get from Timebox', required=True),
+        'timebox_to_id': fields.many2one('project.gtd.timebox', 'Set to Timebox', required=True),
+        'task_ids': fields.many2many('project.task', 'project_task_rel', 'task_id', 'fill_id', 'Tasks selection')
+                }
 
-_gtd_arch = """
-    <form string="Timebox tasks selection" width="780">
-        <field name="timebox_id" required="1"/>
-        <field name="timebox_to_id" required="1"/>
-        <field name="task_ids" nolabel="1" colspan="4" height="450" domain="[('timebox_id','=',timebox_id),('state','=','open')]"/>
-    </form>
-"""
+    def _get_from_tb(self, cr, uid, context=None):
+        ids = self.pool.get('project.gtd.timebox').search(cr, uid, [], context=context)
+        return ids and ids[0] or False
 
-class wiz_timebox_fill(wizard.interface):
-    def _fill(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        ids = pool.get('project.gtd.timebox').search(cr, uid, [], context=context)
-        return {
-            'timebox_id': ids and ids[0] or False,
-            'timebox_to_id': data['id']
-        }
+    def _get_to_tb(self, cr, uid, context=None):
+        if 'active_id' in context:
+            return context['active_id']
+        return False
 
-    def _process(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        ids = data['form']['task_ids']
-        pool.get('project.task').write(cr, uid, ids[0][2], {'timebox_id':data['form']['timebox_to_id']})
+    _defaults = {
+         'timebox_id': _get_from_tb,
+         'timebox_to_id': _get_to_tb,
+                 }
+
+    def process(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if not ids:
+            return {}
+        data = self.read(cr, uid, ids, [])
+        if not data[0]['task_ids']:
+            return {}
+        self.pool.get('project.task').write(cr, uid, data[0]['task_ids'], {'timebox_id':data[0]['timebox_to_id']})
         return {}
 
-    states = {
-        'init' : {
-            'actions' : [_fill],
-            'result' : {
-                'type':'form',
-                'arch':_gtd_arch,
-                'fields':_gtd_field,
-                'state':[
-                    ('end','Cancel', 'gtk-cancel'),
-                    ('process','Add to Timebox')
-                ]
-            }
-        },
-        'process' : {
-            'actions' : [_process],
-            'result' : {'type':'state', 'state':'end'}
-        }
-    }
-wiz_timebox_fill('project.gtd.timebox.fill')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+project_timebox_fill()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
new file mode 100644
index 00000000000..1c3d221c6ac
--- /dev/null
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_project_gtd_fill" model="ir.ui.view">
+            <field name="name">Plannify Timebox</field>
+            <field name="model">project.timebox.fill.plan</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="Plannify Timebox">
+              		  <field name="timebox_id" />
+              		  <field name="timebox_to_id" />
+              		  <field colspan="4" name="task_ids" nolabel="1" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
+		              <group colspan="4" col="6">
+				            <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		              		<button name="process" icon="gtk-ok" string="Add to Timebox" type="object" />
+		              </group>
+			  	</form>
+            </field>
+		</record>
+
+		<record id="action_project_gtd_fill" model="ir.actions.act_window">
+	           <field name="name">Plannify Timebox</field>
+	           <field name="type">ir.actions.act_window</field>
+	           <field name="res_model">project.timebox.fill.plan</field>
+	           <field name="view_type">form</field>
+	           <field name="view_mode">form</field>
+	           <field name="view_id" ref="view_project_gtd_fill"/>
+		       <field name="context">{'record_id' : active_id}</field>
+	           <field name="target">new</field>
+    	</record>
+
+    	<record model="ir.values" id="project_gtd_fill_values">
+            <field name="model_id" ref="model_project_gtd_timebox" />
+            <field name="object" eval="1" />
+            <field name="name">Plannify Timebox</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_project_gtd_fill'))" />
+            <field name="key">action</field>
+            <field name="model">project.gtd.timebox</field>
+        </record>
+
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/project_issue/__init__.py b/addons/project_issue/__init__.py
old mode 100644
new mode 100755
index 4ee524bb479..c51b756f4ca
--- a/addons/project_issue/__init__.py
+++ b/addons/project_issue/__init__.py
@@ -20,7 +20,6 @@
 #
 ##############################################################################
 
-
 import project_issue
 import report
 import wizard
diff --git a/addons/project_issue/__terp__.py b/addons/project_issue/__openerp__.py
old mode 100644
new mode 100755
similarity index 93%
rename from addons/project_issue/__terp__.py
rename to addons/project_issue/__openerp__.py
index 03ec9e22285..2bf67d47191
--- a/addons/project_issue/__terp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -39,10 +39,8 @@
         'project_issue_data.xml'
     ],
     'update_xml': [
-        'project_issue_wizard.xml',
         'project_issue_view.xml',
-        'project_issue_menu.xml',        
-        'project_feature_menu.xml',
+        'project_issue_menu.xml',
         'report/project_issue_report_view.xml',
         'security/project_issue_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/project_issue/project_feature_menu.xml b/addons/project_issue/project_feature_menu.xml
deleted file mode 100644
index 1c757a73909..00000000000
--- a/addons/project_issue/project_feature_menu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data noupdate="1">
-
-
-</data>
-</openerp>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
old mode 100644
new mode 100755
index 1fb1c353bab..3f35913ae75
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -23,11 +23,11 @@ import base64
 import os
 import re
 import time
-import time
-import tools
-from crm import crm
 import mx.DateTime
 from datetime import datetime, timedelta
+
+import tools
+from crm import crm
 from osv import fields,osv,orm
 from osv.orm import except_orm
 from tools.translate import _
@@ -58,9 +58,9 @@ class project_issue(osv.osv):
         @param ids: List of Openday’s IDs
         @return: difference between current date and log date
         @param context: A standard dictionary for contextual values
-        """        
-        cal_obj = self.pool.get('resource.calendar') 
-        res_obj = self.pool.get('resource.resource')     
+        """
+        cal_obj = self.pool.get('resource.calendar')
+        res_obj = self.pool.get('resource.resource')
 
         res = {}
         for issue in self.browse(cr, uid, ids , context):
@@ -88,7 +88,7 @@ class project_issue(osv.osv):
 
                     duration = float(ans.days)
                     if issue.section_id.resource_calendar_id:
-                        duration =  float(ans.days) * 24                        
+                        duration =  float(ans.days) * 24
                         new_dates = cal_obj.interval_get(cr,
                             uid,
                             issue.section_id.resource_calendar_id and issue.section_id.resource_calendar_id.id or False,
@@ -100,9 +100,9 @@ class project_issue(osv.osv):
                         date_until = mx.DateTime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
                         for in_time, out_time in new_dates:
                             if in_time.date not in no_days:
-                                no_days.append(in_time.date)                            
+                                no_days.append(in_time.date)
                             if out_time > date_until:
-                                break                            
+                                break
                         duration =  len(no_days)
                 res[issue.id][field] = abs(int(duration))
         return res
@@ -140,6 +140,60 @@ class project_issue(osv.osv):
            return user.context_project_id
        return False
 
+    def convert_issue_task(self, cr, uid, ids, context=None):
+        case_obj = self.pool.get('project.issue')
+        data_obj = self.pool.get('ir.model.data')
+        task_obj = self.pool.get('project.task')
+
+        if context is None:
+            context = {}
+
+#        for case in case_obj.browse(cr, uid, ids, context=context):
+#            if case.state != 'open':
+#                raise osv.except_osv(_('Warning !'),
+#                    _('Issues or Feature Requests should be in \'Open\' state before converting into Task.'))
+
+        result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+        res = data_obj.read(cr, uid, result, ['res_id'])
+        id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
+        id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        for bug in case_obj.browse(cr, uid, ids, context=context):
+            new_task_id = task_obj.create(cr, uid, {
+                'name': bug.name,
+                'partner_id': bug.partner_id.id,
+                'description':bug.description,
+                'date': bug.date,
+                'project_id':bug.project_id.id,
+                'priority':bug.priority,
+                'user_id':bug.user_id.id,
+                'planned_hours': 0.0,
+            })
+
+            new_task = task_obj.browse(cr, uid, new_task_id)
+
+            vals = {
+                'task_id': new_task_id,
+                }
+            case_obj.write(cr, uid, [bug.id], vals)
+
+        return  {
+            'name': _('Tasks'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'project.task',
+            'res_id': int(new_task_id),
+            'view_id': False,
+            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'],
+            'nodestroy': True
+        }
+
     def _convert(self, cr, uid, ids, xml_id, context=None):
         data_obj = self.pool.get('ir.model.data')
         id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
old mode 100644
new mode 100755
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
old mode 100644
new mode 100755
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
old mode 100644
new mode 100755
index 8d0601137b5..1fc5c3bce7d
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -14,7 +14,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="project_issue_tree_view"/>
         <field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
-        <field name="context">{"search_default_My Bugs":1,"search_default_Current Bugs":1,"search_default_project_id":project_id}</field>
+        <field name="context">{"search_default_my_bugs":1,"search_default_current_bugs":1,"search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
old mode 100644
new mode 100755
index 6e46b5b50df..343005d25d7
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -54,8 +54,8 @@
                                 <field name="priority" colspan="3"/>
                                 <field name="task_id" />
                                 <button string="Convert To Task"
-                                    name="%(wizard_project_issue_task_set)d"
-                                    icon="gtk-index" type="action"
+                                    name="convert_issue_task"
+                                    icon="gtk-index" type="object"
                                     attrs="{'invisible':[('task_id','!=',False)]}" />
                             </group>
                             <separator string= "Description" colspan="4"/>
@@ -207,10 +207,10 @@
                     <group>
                         <field name="name" select='1' string="Subject"/>
                         <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" string="My Bugs"/>
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" name="my_bugs"/>
                         </field>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" string="Current Bugs"/>
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
                             <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
                         </field>
                         <field name="project_id" select="1" widget="selection" string="Project">
@@ -220,6 +220,21 @@
                                 />
                         </field>
                     </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="16">
+	                    <filter string="Stage" icon="terp-crm" domain="[]"
+	                        context="{'group_by':'stage_id'}" />
+	                    <filter string="Priority" icon="terp-crm" domain="[]"
+	                        context="{'group_by':'priority'}" />
+	                    <filter string="Campaign" icon="terp-crm"
+	                        domain="[]" context="{'group_by':'type_id'}" />
+	                    <separator orientation="vertical" />
+	                    <filter string="Partner" icon="terp-crm" domain="[]"
+	                        context="{'group_by':'partner_id'}" />
+	                    <filter string="Salesman" icon="terp-crm"
+	                        domain="[]" context="{'group_by':'user_id'}" />
+	                    <separator orientation="vertical" />
+                	</group>
                 </search>
             </field>
         </record>
@@ -293,10 +308,10 @@
                     <group>
                         <field name="name" select='1' string="Feature description"/>
                         <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" string="My Feature"/>
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" name="my_feature"/>
                         </field>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" string="Current Feature"/>
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
                         <field name="project_id" select="1" widget="selection" string="Project">
diff --git a/addons/project_issue/project_issue_wizard.xml b/addons/project_issue/project_issue_wizard.xml
deleted file mode 100644
index 16e54da49d7..00000000000
--- a/addons/project_issue/project_issue_wizard.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <wizard
-            id="wizard_project_issue_task_set"
-            keyword="client_action_multi"
-            model="project.issue"
-            name="project.issue.task_set"
-            multi="True"
-            string="Convert To Task"/>
-    </data>
-</openerp>
diff --git a/addons/project_issue/report/__init__.py b/addons/project_issue/report/__init__.py
old mode 100644
new mode 100755
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
old mode 100644
new mode 100755
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
old mode 100644
new mode 100755
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
old mode 100644
new mode 100755
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
old mode 100644
new mode 100755
diff --git a/addons/project_issue/wizard/project_issue_wizard.py b/addons/project_issue/wizard/project_issue_wizard.py
deleted file mode 100644
index 4aef1529619..00000000000
--- a/addons/project_issue/wizard/project_issue_wizard.py
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-from tools.translate import _
-
-class issue2task(wizard.interface):    
-    
-    def _check_state(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('project.issue')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.state != 'open':
-                raise wizard.except_wizard(_('Warning !'),
-                    _('Issues or Feature Requests should be in \'Open\' state before converting into Task.'))
-        return {}
-
-    def _makeTask(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
-        res = data_obj.read(cr, uid, result, ['res_id'])
-        
-
-        id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
-        id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-        bug_case_obj = pool.get('project.issue')
-        task_obj = pool.get('project.task')        
-        for bug in bug_case_obj.browse(cr, uid, data['ids']):                
-            new_task_id = task_obj.create(cr, uid, {            
-                'name': bug.name,                
-                'partner_id': bug.partner_id.id,                
-                'description':bug.description,
-                'date': bug.date,
-                'project_id':bug.project_id.id, 
-                'priority':bug.priority,    
-                'user_id':bug.user_id.id,  
-                'planned_hours': 0.0,        
-            })       
-            
-            new_task = task_obj.browse(cr, uid, new_task_id)
-            
-            vals = {
-                'task_id': new_task_id,                
-                }            
-
-            bug_case_obj.write(cr, uid, [bug.id], vals)           
-        
-        value = {            
-            'name': _('Tasks'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'project.task',
-            'res_id': int(new_task_id),
-            'view_id': False,
-            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value    
-
-    states = {
-        'init': {
-            'actions': [_check_state],
-            'result': {'type': 'action', 'action': _makeTask, 'state':'end' }
-        }        
-    }
-
-issue2task('project.issue.task_set')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/__terp__.py b/addons/project_long_term/__openerp__.py
similarity index 92%
rename from addons/project_long_term/__terp__.py
rename to addons/project_long_term/__openerp__.py
index 25529f5b245..99bce80caca 100644
--- a/addons/project_long_term/__terp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -41,8 +41,12 @@
     "update_xml": [
         "security/ir.model.access.csv",
         "project_long_term_wizard.xml" ,
+        "wizard/project_schedule_tasks_view.xml",
         "project_long_term_view.xml",
-        "project_long_term_workflow.xml"
+        "project_long_term_workflow.xml",
+        "wizard/project_compute_phases_view.xml",
+        "wizard/project_compute_tasks_view.xml",
+
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index d4131c24e05..0be0f88a576 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -135,7 +135,7 @@
                                     </notebook>
                                   </form>
                              </field>
-                               <button name="%(wizard_schedule_task)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
+                           	<button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
                     </notebook>
                     <newline/>
@@ -196,7 +196,7 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" />
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" name="current"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
                         <separator orientation="vertical"/>
@@ -205,7 +205,7 @@
                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
                         </field>
                         <field name="responsible_id" widget="selection">
-                            <filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" string="My Phase"/>
+                            <filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" name="my_phase"/>
                         </field>
                         <field name="date_start"/>
                     </group>
@@ -225,7 +225,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,gantt</field>
-            <field name="context">{"search_default_Current":1,"search_default_My Phase":1}</field>
+            <field name="context">{"search_default_current":1,"search_default_my_phase":1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
@@ -296,9 +296,13 @@
     # Menu Items
     # ------------------------------------------------------
 
-        <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
+        <menuitem action="act_project_phase"
+            groups="base.group_extended"
+            id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
-        <menuitem id="menu_pm_resources_project1" name="Resources" parent="base.menu_main_pm" sequence="2"/>
+        <menuitem id="menu_pm_resources_project1"
+            groups="base.group_extended"
+            name="Resources" parent="base.menu_main_pm" sequence="2"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
diff --git a/addons/project_long_term/project_long_term_wizard.xml b/addons/project_long_term/project_long_term_wizard.xml
index 0904bbb4429..98dfabb323e 100644
--- a/addons/project_long_term/project_long_term_wizard.xml
+++ b/addons/project_long_term/project_long_term_wizard.xml
@@ -2,25 +2,25 @@
 <openerp>
     <data>
 
-        <wizard id="wizard_compute_phase" menu="False" model="project.phase" name="wizard.compute.phases" string="Compute Phase Scheduling"/>
-        <wizard id="wizard_schedule_task" menu="False" model="project.phase" name="phase.schedule.tasks" string="Schedule Tasks"/>
-        <wizard id="wizard_compute_task" model="project.task" menu="False" name="wizard.compute.tasks" string="Compute Task Scheduling"/>
+        <!--<wizard id="wizard_compute_phase" menu="False" model="project.phase" name="wizard.compute.phases" string="Compute Phase Scheduling"/>-->
+        <!--<wizard id="wizard_schedule_task" menu="False" model="project.phase" name="phase.schedule.tasks" string="Schedule Tasks"/>-->
+        <!--<wizard id="wizard_compute_task" model="project.task" menu="False" name="wizard.compute.tasks" string="Compute Task Scheduling"/>-->
 
 		<menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>
 		<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>
-		<menuitem
+	<!--	<menuitem
             action="wizard_compute_phase"
             id="menu_wizard_compute_phase"
             parent="base.menu_pm_planning"
             type="wizard"
             sequence="1"/>
-
-        <menuitem
+-->
+<!--        <menuitem
             action="wizard_compute_task"
             id="menu_wizard_compute_task"
             parent="base.menu_pm_planning"
             type="wizard"
             sequence="1"/>
-
+-->
     </data>
 </openerp>
diff --git a/addons/project_long_term/wizard/__init__.py b/addons/project_long_term/wizard/__init__.py
index 06880dbe6e2..fb8a29449f7 100644
--- a/addons/project_long_term/wizard/__init__.py
+++ b/addons/project_long_term/wizard/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-s
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-import compute_phases_date
-import compute_tasks_date
-import schedule_tasks
+import project_compute_phases
+import project_compute_tasks
+import project_schedule_tasks
 import working_calendar
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/project_compute_phases.py
similarity index 77%
rename from addons/project_long_term/wizard/compute_phases_date.py
rename to addons/project_long_term/wizard/project_compute_phases.py
index 61f3bb42251..ddf8ba315c0 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -22,26 +22,32 @@ import datetime
 from resource.faces import *
 from new import classobj
 
-import wizard
-import pooler
 from tools.translate import _
+from osv import fields, osv
 
 import working_calendar as wkcal
 
-compute_form = """<?xml version="1.0" ?>
-<form string="Compute Scheduling of Phases">
+class project_compute_phases(osv.osv_memory):
 
-    <field name="project_id" colspan="4"/>
+    _name = 'project.compute.phases'
+    _description = 'Project Compute Phases'
+    _columns = {
+       'target_project': fields.selection([('all', 'Compute All Projects'),
+                                           ('one', 'Compute a Single Project'),
+                                           ], 'Schedule', required = True),
 
-</form>"""
+        'project_id': fields.many2one('project.project', 'Project')
+                }
 
-compute_fields = {
-    'project_id': {'string':'Project', 'type':'many2one', 'relation':'project.project', 'help': 'If you do not specify project then it will take All projects with state=draft, open, pending'},
+    _defaults = {
+        'target_project': 'all'
+                }
 
-}
+    def check_selection(self, cr, uid, ids, context=None):
+        data_select = self.read(cr, uid, ids, ['target_project'])[0]
+        return self.compute_date(cr, uid, ids, context=context)
 
-class wizard_compute_phases(wizard.interface):
-    def _phase_schedule(self, cr, uid, phase, start_date, calendar_id=False, context={}):
+    def _phase_schedule(self, cr, uid, phase, start_date, calendar_id=False, context=None):
 
        """Schedule phase with the start date till all the next phases are completed.
 
@@ -49,11 +55,13 @@ class wizard_compute_phases(wizard.interface):
                    calendar_id -- working calendar of the project
 
        """
-       pool = pooler.get_pool(cr.dbname)
-       phase_obj = pool.get('project.phase')
-       resource_obj = pool.get('resource.resource')
-       uom_obj = pool.get('product.uom')
+       phase_obj = self.pool.get('project.phase')
+       resource_obj = self.pool.get('resource.resource')
+       uom_obj = self.pool.get('product.uom')
        phase_resource_obj = False
+
+       if context is None:
+           context = {}
        if phase:
             leaves = []
             time_efficiency = 1.0
@@ -117,15 +125,20 @@ class wizard_compute_phases(wizard.interface):
                else:
                    continue
 
-    def _compute_date(self, cr, uid, data, context={}):
+    def compute_date(self, cr, uid, ids, context=None):
         """
         Compute the phases for scheduling.
         """
-        pool = pooler.get_pool(cr.dbname)
-        project_obj = pool.get('project.project')
-        phase_obj = pool.get('project.phase')
-        if data['form']['project_id']:        # If project mentioned find its phases
-            project_id = project_obj.browse(cr, uid, data['form']['project_id'], context=context)
+
+        if context is None:
+            context = {}
+        project_obj = self.pool.get('project.project')
+        phase_obj = self.pool.get('project.phase')
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        if not data['project_id'] and data['target_project'] == 'one':
+            raise osv.except_osv(_('Error!'), _('Please Specify Project to be schedule'))
+        if data['project_id']:        # If project mentioned find its phases
+            project_id = project_obj.browse(cr, uid, data['project_id'], context=context)
             phase_ids = phase_obj.search(cr, uid, [('project_id', '=', project_id.id),
                                                   ('state', 'in', ['draft', 'open', 'pending']),
                                                   ('previous_phase_ids', '=', False)
@@ -143,37 +156,24 @@ class wizard_compute_phases(wizard.interface):
             start_dt = datetime.datetime.strftime((datetime.datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d %H:%M")
             calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
             self._phase_schedule(cr, uid, phase, start_dt, calendar_id, context=context)
-        return {}
+        return self._open_phases_list(cr, uid, data, context=context)
 
-    def _open_phases_list(self, cr, uid, data, context):
+    def _open_phases_list(self, cr, uid, data, context=None):
         """
         Return the scheduled phases list.
         """
-        pool = pooler.get_pool(cr.dbname)
-        mod_obj = pool.get('ir.model.data')
-        act_obj = pool.get('ir.actions.act_window')
+        if context is None:
+            context = {}
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
         result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id], context=context)[0]
         result['domain'] = [('state', 'not in', ['cancelled','done'])]
-        if data['form']['project_id']:
-            result['domain'] = [('project_id', '=', data['form']['project_id']),
+        if data['project_id']:
+            result['domain'] = [('project_id', '=', data['project_id']),
                                 ('state', 'not in', ['cancelled','done'])]
         return result
 
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state':[
-                ('end', 'Cancel', 'gtk-cancel'),
-                ('compute', 'Compute', 'gtk-ok', True)
-
-            ]},
-        },
-        'compute': {
-            'actions': [_compute_date],
-            'result': {'type': 'action', 'action': _open_phases_list, 'state': 'end'},
-        },
-    }
-wizard_compute_phases('wizard.compute.phases')
+project_compute_phases()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
new file mode 100644
index 00000000000..900112ba409
--- /dev/null
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_project_compute_phases_select" model="ir.ui.view">
+            <field name="name">Compute Scheduling of Phases</field>
+            <field name="model">project.compute.phases</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="Compute Scheduling of Phases">
+		              <field name="target_project" />
+		              <newline />
+		              <group colspan="4" col="6" attrs="{'invisible':[('target_project','=','all')]}">
+		              		<field name="project_id"/>
+		              </group>
+		              <group colspan="4" col="6"> <!-- Improve me -->
+		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		            		<button icon="gtk-ok" name="check_selection" string="_Compute" type="object"/>
+		              </group>
+			  	</form>
+            </field>
+		</record>
+
+		<record id="action_project_compute_phases" model="ir.actions.act_window">
+	           <field name="name">Compute Phase Scheduling</field>
+	           <field name="type">ir.actions.act_window</field>
+	           <field name="res_model">project.compute.phases</field>
+	           <field name="view_type">form</field>
+	           <field name="view_mode">form</field>
+	           <field name="view_id" ref="view_project_compute_phases_select"/>
+		       <field name="context">{'record_id' : active_id}</field>
+	           <field name="target">new</field>
+    	</record>
+
+ 		<menuitem id="menu_compute_phase" name="Compute Phase Scheduling"
+        	parent="base.menu_pm_planning" action="action_project_compute_phases"/>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/project_long_term/wizard/compute_tasks_date.py b/addons/project_long_term/wizard/project_compute_tasks.py
similarity index 81%
rename from addons/project_long_term/wizard/compute_tasks_date.py
rename to addons/project_long_term/wizard/project_compute_tasks.py
index 77e7bbd6512..90d2b428580 100644
--- a/addons/project_long_term/wizard/compute_tasks_date.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -23,38 +23,32 @@ from resource.faces import *
 from new import classobj
 import operator
 
+from tools.translate import _
+from osv import osv, fields
+
 import working_calendar as wkcal
 
-import wizard
-import pooler
-from tools.translate import _
+class project_compute_tasks(osv.osv_memory):
+    _name = 'project.compute.tasks'
+    _description = 'Project Compute Tasks'
+    _columns = {
+        'project_id': fields.many2one('project.project', 'Project', required=True)
+                }
 
-compute_form = """<?xml version="1.0" ?>
-<form string="Compute Scheduling of Tasks">
-    <field name="project_id" colspan="4"/>
-</form>"""
-
-success_msg = """<?xml version="1.0" ?>
-<form string="Compute Scheduling of Tasks">
-    <label string="Task Scheduling completed successfully."/>
-</form>"""
-
-compute_fields = {
-    'project_id': {'string':'Project', 'type':'many2one', 'relation':'project.project', 'required':True},
-}
-
-class wizard_compute_tasks(wizard.interface):
-
-    def _compute_date(self, cr, uid, data, context):
+    def compute_date(self, cr, uid, ids, context=None):
         """
         Schedule the tasks according to resource available and priority.
         """
-        pool = pooler.get_pool(cr.dbname)
-        project_obj = pool.get('project.project')
-        task_pool = pool.get('project.task')
-        resource_obj = pool.get('resource.resource')
-        user_obj = pool.get('res.users')
-        project_id = data['form']['project_id']
+        project_obj = self.pool.get('project.project')
+        task_pool = self.pool.get('project.task')
+        resource_obj = self.pool.get('resource.resource')
+        user_obj = self.pool.get('res.users')
+
+        if context is None:
+            context = {}
+
+        data = self.read(cr, uid, ids, [])[0]
+        project_id = data['project_id']
         project = project_obj.browse(cr, uid, project_id, context=context)
         task_ids = task_pool.search(cr, uid, [('project_id', '=', project_id),
                                               ('state', 'in', ['draft', 'open', 'pending'])
@@ -106,7 +100,7 @@ class wizard_compute_tasks(wizard.interface):
                 try:
                     resource = reduce(operator.or_, resources)
                 except:
-                    raise wizard.except_wizard(_('Error'), _('Project must have members assigned !'))
+                    raise osv.except_osv(_('Error'), _('Project must have members assigned !'))
                 minimum_time_unit = 1
                 if calendar_id:        # If project has calendar
                     working_days = wkcal.compute_working_calendar(cr, uid, calendar_id)
@@ -142,20 +136,7 @@ class wizard_compute_tasks(wizard.interface):
                                                                          'user_id': user_id[0]},
                                                                          context=ctx)
                 loop_no +=1
-        return {}
+        return {} #improve me => Task Scheduling completed successfully => give this msg at end of wizard
 
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state': [
-                ('end', 'Cancel', 'gtk-cancel'),
-                ('compute', 'Compute', 'gtk-ok', True)
-            ]},
-        },
-        'compute': {
-            'actions': [_compute_date],
-            'result': {'type': 'form','arch': success_msg,'fields': {}, 'state': [('end', 'Ok')]},
-        }
-    }
-wizard_compute_tasks('wizard.compute.tasks')
+project_compute_tasks()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
new file mode 100644
index 00000000000..3b03f20fe1e
--- /dev/null
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_project_compute_tasks" model="ir.ui.view">
+            <field name="name">Compute Task Scheduling</field>
+            <field name="model">project.compute.tasks</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="Compute Scheduling of Phases">
+		              <field name="project_id"/>
+		              <group colspan="4" col="6">
+		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		            		<button icon="gtk-ok" name="compute_date" string="Compute" type="object"/>
+		              </group>
+			  	</form>
+            </field>
+		</record>
+
+		<record id="action_project_compute_tasks" model="ir.actions.act_window">
+	           <field name="name">Compute Task Scheduling</field>
+	           <field name="type">ir.actions.act_window</field>
+	           <field name="res_model">project.compute.tasks</field>
+	           <field name="view_type">form</field>
+	           <field name="view_mode">form</field>
+	           <field name="view_id" ref="view_project_compute_tasks"/>
+		       <field name="context">{'record_id' : active_id}</field>
+	           <field name="target">new</field>
+    	</record>
+
+ 		<menuitem id="menu_compute_tasks" name="Compute Task Scheduling"
+        	parent="base.menu_pm_planning" action="action_project_compute_tasks"/>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
similarity index 82%
rename from addons/project_long_term/wizard/schedule_tasks.py
rename to addons/project_long_term/wizard/project_schedule_tasks.py
index 4a170859032..2d0071547be 100644
--- a/addons/project_long_term/wizard/schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -23,24 +23,36 @@ from resource.faces import *
 from new import classobj
 import operator
 
+from tools.translate import _
+from osv import osv, fields
+
 import working_calendar as wkcal
 
-import wizard
-import pooler
-from tools.translate import _
+class project_schedule_task(osv.osv_memory):
 
-success_msg = """<?xml version="1.0" ?>
-<form string="Compute Scheduling of Tasks">
-    <label string="Task Scheduling completed successfully."/>
-</form>"""
+    _name = "project.schedule.tasks"
+    _description = 'project.schedule.tasks'
+    _columns = {
+        'msg': fields.char('Message', size=64)
+                }
+    _defaults = {
+         'msg': 'Task Scheduling Completed Successfully'
+                }
 
-class wizard_schedule_task(wizard.interface):
+    def default_get(self, cr, uid, fields_list, context=None):
+        res = super(project_schedule_task, self).default_get(cr, uid, fields_list, context)
+        self.compute_date(cr, uid, context=context)
+        return res
 
-    def _create_resources(self, cr, uid, phase, context={}):
+    def create_resources(self, cr, uid, phase, context=None):
         """
         Return a list of  Resource Class objects for the resources allocated to the phase.
         """
         resource_objs = []
+
+        if context is None:
+            context = {}
+
         for resource in phase.resource_ids:
             res = resource.resource_id
             leaves = []
@@ -57,15 +69,21 @@ class wizard_schedule_task(wizard.interface):
                                           }))
         return resource_objs
 
-    def _compute_date(self, cr, uid, data, context={}):
+    def compute_date(self, cr, uid, context=None):
         """
         Schedule the tasks according to resource available and priority.
         """
-        pool = pooler.get_pool(cr.dbname)
-        phase_obj = pool.get('project.phase')
-        task_obj = pool.get('project.task')
-        user_obj = pool.get('res.users')
-        phase = phase_obj.browse(cr, uid, data['id'], context=context)
+
+        phase_obj = self.pool.get('project.phase')
+        task_obj = self.pool.get('project.task')
+        user_obj = self.pool.get('res.users')
+
+        if context is None:
+            context = {}
+
+        if not 'active_id' in context:
+            return {}
+        phase = phase_obj.browse(cr, uid, context['active_id'], context=context)
         task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['open', 'draft', 'pending'] , phase.task_ids)))
         if task_ids:
             task_ids.sort()
@@ -78,7 +96,7 @@ class wizard_schedule_task(wizard.interface):
                     start_date = phase.project_id.date_start
             date_start = datetime.datetime.strftime(datetime.datetime.strptime(start_date, "%Y-%m-%d"), "%Y-%m-%d %H:%M")
             calendar_id = phase.project_id.resource_calendar_id.id
-            resources = self._create_resources(cr, uid, phase)
+            resources = self.create_resources(cr, uid, phase)
             priority_dict = {'0': 1000, '1': 800, '2': 500, '3': 300, '4': 100}
             # Create dynamic no of tasks with the resource specified
             def create_tasks(j, eff, priorty=500, obj=False):
@@ -101,7 +119,7 @@ class wizard_schedule_task(wizard.interface):
                 try:
                     resource = reduce(operator.or_, resources)
                 except:
-                    raise wizard.except_wizard(_('Error'), _('Phase must have resources assigned !'))
+                    raise osv.except_osv(_('Error'), _('Phase must have resources assigned !'))
                 minimum_time_unit = 1
                 if calendar_id:            # If project has working calendar
                     working_days = wkcal.compute_working_calendar(cr, uid, calendar_id)
@@ -136,11 +154,6 @@ class wizard_schedule_task(wizard.interface):
                                                                     context=ctx)
                 loop_no +=1
         return {}
-    states = {
-        'init': {
-            'actions': [_compute_date],
-            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok', 'gtk-ok', True)]},
-        }
-    }
-wizard_schedule_task('phase.schedule.tasks')
+
+project_schedule_task()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/project_schedule_tasks_view.xml b/addons/project_long_term/wizard/project_schedule_tasks_view.xml
new file mode 100644
index 00000000000..1011f366aa5
--- /dev/null
+++ b/addons/project_long_term/wizard/project_schedule_tasks_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_project_schedule_tasks" model="ir.ui.view">
+            <field name="name">Schedule Tasks</field>
+            <field name="model">project.schedule.tasks</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="Schedule Tasks">
+              		  <label string="Task Scheduling completed successfully."/>
+		              <group colspan="4" col="6">
+		            		<button  icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/>
+		              </group>
+			  	</form>
+            </field>
+		</record>
+
+		<record id="action_project_schedule_tasks" model="ir.actions.act_window">
+	           <field name="name">Schedule Tasks</field>
+	           <field name="type">ir.actions.act_window</field>
+	           <field name="res_model">project.schedule.tasks</field>
+	           <field name="view_type">form</field>
+	           <field name="view_mode">form</field>
+	           <field name="view_id" ref="view_project_schedule_tasks"/>
+		       <field name="context">{'record_id' : active_id}</field>
+	           <field name="target">new</field>
+    	</record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/project_messages/__init__.py b/addons/project_messages/__init__.py
index de63635487f..49b83129fe3 100644
--- a/addons/project_messages/__init__.py
+++ b/addons/project_messages/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import messages
+import project_messages
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_messages/__terp__.py b/addons/project_messages/__openerp__.py
similarity index 100%
rename from addons/project_messages/__terp__.py
rename to addons/project_messages/__openerp__.py
diff --git a/addons/project_messages/messages.py b/addons/project_messages/project_messages.py
similarity index 92%
rename from addons/project_messages/messages.py
rename to addons/project_messages/project_messages.py
index 422bdb3675c..ab7f96b71d4 100644
--- a/addons/project_messages/messages.py
+++ b/addons/project_messages/project_messages.py
@@ -22,7 +22,8 @@ from osv import fields, osv
 import netsvc
 
 class messages(osv.osv):
-    """Message from one user to another within a project
+    """
+    Message from one user to another within a project
     """
     _name = 'project.messages'
     logger = netsvc.Logger()
@@ -40,7 +41,7 @@ class messages(osv.osv):
         'to_id':None,
     }
 
-    def broadcast(self, cr, uid, project_id, message):
+    def broadcast(self, cr, uid, project_id, message, context=None):
         """ Send a message to all the users of a project.
         The sender of the message is the current user.
 
@@ -55,6 +56,7 @@ class messages(osv.osv):
             'project_id':project_id,
             'message':message
         }, context=context)
+
 messages()
 
 class project_with_message(osv.osv):
@@ -66,3 +68,5 @@ class project_with_message(osv.osv):
             domain="[('to_id','in',[uid,False])]"),
     }
 project_with_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_mrp/__init__.py b/addons/project_mrp/__init__.py
index 2d56968e7bd..b310d99d87d 100644
--- a/addons/project_mrp/__init__.py
+++ b/addons/project_mrp/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,10 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 import mrp
-import project
+import project_mrp
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_mrp/__terp__.py b/addons/project_mrp/__openerp__.py
similarity index 81%
rename from addons/project_mrp/__terp__.py
rename to addons/project_mrp/__openerp__.py
index 7b09931c06b..8fe1717e631 100644
--- a/addons/project_mrp/__terp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,23 +25,23 @@
     'version': '1.0',
     'category': 'Generic Modules/Projects & Services',
     'description': """
-This module creates a link between procurement orders 
+This module creates a link between procurement orders
 containing "service" lines and project management tasks.
 
-When installed, this module will automatically create a new task 
-for each procurement order line, when the corresponding product  
-meets the following characteristics: 
+When installed, this module will automatically create a new task
+for each procurement order line, when the corresponding product
+meets the following characteristics:
   * Type = Service
   * Procurement method (Order fulfillment) = MTO (make to order)
-  * Supply/Procurement method = Produce  
+  * Supply/Procurement method = Produce
 
-The new task is created outside of any existing project, but 
+The new task is created outside of any existing project, but
 can be added to a project manually.
 
 When the project task is completed or cancelled, the workflow of the corresponding
-procurement line is updated accordingly. 
+procurement line is updated accordingly.
 
-This module is useful to be able to invoice services based on tasks 
+This module is useful to be able to invoice services based on tasks
 automatically created via sale orders.
 
 """,
@@ -49,7 +49,7 @@ automatically created via sale orders.
     'website': 'http://www.openerp.com',
     'depends': ['project', 'mrp', 'sale', 'mrp_jit'],
     'init_xml': [],
-    'update_xml': ['project_workflow.xml', 'process/project_mrp_process.xml'],
+    'update_xml': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/project_mrp/i18n/ar.po b/addons/project_mrp/i18n/ar.po
index ce96257b4aa..b95b5685ca6 100644
--- a/addons/project_mrp/i18n/ar.po
+++ b/addons/project_mrp/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/bg.po b/addons/project_mrp/i18n/bg.po
index ce96257b4aa..b95b5685ca6 100644
--- a/addons/project_mrp/i18n/bg.po
+++ b/addons/project_mrp/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/bs.po b/addons/project_mrp/i18n/bs.po
index ce96257b4aa..b95b5685ca6 100644
--- a/addons/project_mrp/i18n/bs.po
+++ b/addons/project_mrp/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/ca.po b/addons/project_mrp/i18n/ca.po
index c2d80687aba..b7dcba16707 100644
--- a/addons/project_mrp/i18n/ca.po
+++ b/addons/project_mrp/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/cs.po b/addons/project_mrp/i18n/cs.po
index ce96257b4aa..b95b5685ca6 100644
--- a/addons/project_mrp/i18n/cs.po
+++ b/addons/project_mrp/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/de.po b/addons/project_mrp/i18n/de.po
index 50927c17a4a..3a1904b68b4 100644
--- a/addons/project_mrp/i18n/de.po
+++ b/addons/project_mrp/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/el.po b/addons/project_mrp/i18n/el.po
index 079c40e581c..6965f270fef 100644
--- a/addons/project_mrp/i18n/el.po
+++ b/addons/project_mrp/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/project_mrp/i18n/es.po b/addons/project_mrp/i18n/es.po
index 07467611955..913ec20eeec 100644
--- a/addons/project_mrp/i18n/es.po
+++ b/addons/project_mrp/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/es_AR.po b/addons/project_mrp/i18n/es_AR.po
index 3c2db79160c..3f955a5b59d 100644
--- a/addons/project_mrp/i18n/es_AR.po
+++ b/addons/project_mrp/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/et.po b/addons/project_mrp/i18n/et.po
index 8514aeb593f..ea5a85063c3 100644
--- a/addons/project_mrp/i18n/et.po
+++ b/addons/project_mrp/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/fr.po b/addons/project_mrp/i18n/fr.po
index c4ffdfaa6ed..70927a778b4 100644
--- a/addons/project_mrp/i18n/fr.po
+++ b/addons/project_mrp/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/hr.po b/addons/project_mrp/i18n/hr.po
index bf078a254c7..e651ba4ae5e 100644
--- a/addons/project_mrp/i18n/hr.po
+++ b/addons/project_mrp/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/project_mrp/i18n/hu.po b/addons/project_mrp/i18n/hu.po
index ce96257b4aa..b95b5685ca6 100644
--- a/addons/project_mrp/i18n/hu.po
+++ b/addons/project_mrp/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/id.po b/addons/project_mrp/i18n/id.po
index ccd242d44c2..f8869ddaf2a 100644
--- a/addons/project_mrp/i18n/id.po
+++ b/addons/project_mrp/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/it.po b/addons/project_mrp/i18n/it.po
index 75ed0b18f7a..92bdbcc7cf6 100644
--- a/addons/project_mrp/i18n/it.po
+++ b/addons/project_mrp/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/ko.po b/addons/project_mrp/i18n/ko.po
index 2f41a585bc6..ce853c40617 100644
--- a/addons/project_mrp/i18n/ko.po
+++ b/addons/project_mrp/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/lt.po b/addons/project_mrp/i18n/lt.po
index ce96257b4aa..b95b5685ca6 100644
--- a/addons/project_mrp/i18n/lt.po
+++ b/addons/project_mrp/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/nl.po b/addons/project_mrp/i18n/nl.po
index 67432616919..b7f0b0e3dfc 100644
--- a/addons/project_mrp/i18n/nl.po
+++ b/addons/project_mrp/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/nl_BE.po b/addons/project_mrp/i18n/nl_BE.po
index 97fccfe6e4a..742120d6f67 100644
--- a/addons/project_mrp/i18n/nl_BE.po
+++ b/addons/project_mrp/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/pl.po b/addons/project_mrp/i18n/pl.po
index e36c78c1324..22c5097c897 100644
--- a/addons/project_mrp/i18n/pl.po
+++ b/addons/project_mrp/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/pt.po b/addons/project_mrp/i18n/pt.po
index 0f9c8e18499..04541f65886 100644
--- a/addons/project_mrp/i18n/pt.po
+++ b/addons/project_mrp/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/pt_BR.po b/addons/project_mrp/i18n/pt_BR.po
index b96f5081446..cd1dd6a9738 100644
--- a/addons/project_mrp/i18n/pt_BR.po
+++ b/addons/project_mrp/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/ro.po b/addons/project_mrp/i18n/ro.po
index ce96257b4aa..b95b5685ca6 100644
--- a/addons/project_mrp/i18n/ro.po
+++ b/addons/project_mrp/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/ru.po b/addons/project_mrp/i18n/ru.po
index ce96257b4aa..96344f5c8bd 100644
--- a/addons/project_mrp/i18n/ru.po
+++ b/addons/project_mrp/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-04-13 06:03+0000\n"
+"Last-Translator: grisha <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-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
@@ -25,7 +25,7 @@ msgstr ""
 #: model:process.node,name:project_mrp.process_node_mrptask0
 #: model:process.node,name:project_mrp.process_node_procuretasktask0
 msgid "Task"
-msgstr ""
+msgstr "Задание"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
diff --git a/addons/project_mrp/i18n/sl.po b/addons/project_mrp/i18n/sl.po
index 478e24cecaf..ef50b9b499f 100644
--- a/addons/project_mrp/i18n/sl.po
+++ b/addons/project_mrp/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/sv.po b/addons/project_mrp/i18n/sv.po
index ce96257b4aa..b95b5685ca6 100644
--- a/addons/project_mrp/i18n/sv.po
+++ b/addons/project_mrp/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/tlh.po b/addons/project_mrp/i18n/tlh.po
index 56b9cfd534b..cf170552a25 100644
--- a/addons/project_mrp/i18n/tlh.po
+++ b/addons/project_mrp/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index c167b4bdf7f..2194dc747f2 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/uk.po b/addons/project_mrp/i18n/uk.po
index 56b9cfd534b..cf170552a25 100644
--- a/addons/project_mrp/i18n/uk.po
+++ b/addons/project_mrp/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/project_mrp/i18n/zh_CN.po
index b6ba6b36ff0..58d586d72fb 100644
--- a/addons/project_mrp/i18n/zh_CN.po
+++ b/addons/project_mrp/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/zh_TW.po b/addons/project_mrp/i18n/zh_TW.po
index 7a55e912504..96ea9f1ce51 100644
--- a/addons/project_mrp/i18n/zh_TW.po
+++ b/addons/project_mrp/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index b087883618f..78c858f43dc 100755
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -6,7 +6,7 @@
         Process Node
     -->
 
-    	<record id="process_node_procuretasktask0" model="process.node">
+        <record id="process_node_procuretasktask0" model="process.node">
             <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
@@ -46,9 +46,9 @@
         Process Transition
     -->
 
-    	<record id="process_transition_procuretask0" model="process.transition">
+        <record id="process_transition_procuretask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;	Requisition Task&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Procurement Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;if product type is 'service' then it creates the task.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
             <field model="process.node" name="source_node_id" ref="sale.process_node_saleprocurement0"/>
@@ -65,35 +65,10 @@
         <record id="process_transition_ordertask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Order Task&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;If Requisition method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;If procurement method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_mrptask0"/>
             <field model="process.node" name="source_node_id" ref="mrp.process_node_serviceonorder0"/>
         </record>
 
-        <!--
-        	Process Action
-    	-->
-
-<!--        <record id="process_transition_action_orderconfirmtask0" model="process.transition.action">-->
-<!--            <field eval="&quot;&quot;&quot;action_confirm&quot;&quot;&quot;" name="action"/>-->
-<!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
-<!--            <field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>-->
-<!--            <field name="transition_id" ref="process_transition_ordertask0"/>-->
-<!--        </record>-->
-<!--        -->
-<!--        <record id="process_transition_action_ordercanceltask0" model="process.transition.action">-->
-<!--            <field eval="&quot;&quot;&quot;action_cancel&quot;&quot;&quot;" name="action"/>-->
-<!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
-<!--            <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>-->
-<!--            <field name="transition_id" ref="process_transition_ordertask0"/>-->
-<!--        </record>-->
-<!--        -->
-<!--        <record id="process_transition_action_taskrunprocurement0" model="process.transition.action">-->
-<!--            <field eval="&quot;&quot;&quot;write({'state':'exception'})&quot;&quot;&quot;" name="action"/>-->
-<!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
-<!--            <field eval="&quot;&quot;&quot;Run Requisition&quot;&quot;&quot;" name="name"/>-->
-<!--            <field name="transition_id" ref="process_transition_ordertask0"/>-->
-<!--        </record>-->
-
     </data>
 </openerp>
diff --git a/addons/project_mrp/project.py b/addons/project_mrp/project_mrp.py
similarity index 95%
rename from addons/project_mrp/project.py
rename to addons/project_mrp/project_mrp.py
index 4f0cbdc2251..8029327022d 100644
--- a/addons/project_mrp/project.py
+++ b/addons/project_mrp/project_mrp.py
@@ -26,8 +26,9 @@ class project_task(osv.osv):
     _name = "project.task"
     _inherit = "project.task"
     _columns = {
-        'procurement_id': fields.many2one('mrp.procurement', 'Requisition', ondelete='set null')
+        'procurement_id': fields.many2one('mrp.procurement', 'Procurement', ondelete='set null')
     }
+
     def do_close(self, cr, uid, ids, *args):
         res = super(project_task, self).do_close(cr, uid, ids, *args)
         tasks = self.browse(cr, uid, ids)
@@ -45,6 +46,7 @@ class project_task(osv.osv):
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'mrp.procurement', task.procurement_id.id, 'subflow.cancel', cr)
         return True
-project_task()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+project_task()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_mrp/project_workflow.xml b/addons/project_mrp/project_mrp_workflow.xml
similarity index 100%
rename from addons/project_mrp/project_workflow.xml
rename to addons/project_mrp/project_mrp_workflow.xml
diff --git a/addons/project_planning/__terp__.py b/addons/project_planning/__openerp__.py
similarity index 100%
rename from addons/project_planning/__terp__.py
rename to addons/project_planning/__openerp__.py
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 7d0031c4177..12e6f167304 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -1,187 +1,187 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
+    <data>
 
         <!-- Planning -->
-		<record id="account_analytic_planning_view_tree" model="ir.ui.view">
-			<field name="name">report.account.analytic.planning.tree</field>
-			<field name="model">report_account_analytic.planning</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Planning">
-					<field name="name" />
-					<field name="user_id" />
-					<field name="date_from" />
-					<field name="date_to" />
-					<field name="business_days" />
-					<field name="total_planned" />
-					<field name="total_free" />
-					<field name="state" />
-				</tree>
-			</field>
-		</record>
+        <record id="account_analytic_planning_view_tree" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.tree</field>
+            <field name="model">report_account_analytic.planning</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Planning">
+                    <field name="name" />
+                    <field name="user_id" />
+                    <field name="date_from" />
+                    <field name="date_to" />
+                    <field name="business_days" />
+                    <field name="total_planned" />
+                    <field name="total_free" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
 
-		<record id="account_analytic_planning_view_form" model="ir.ui.view">
-			<field name="name">report.account.analytic.planning.form</field>
-			<field name="model">report_account_analytic.planning</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Planning by Account">
-					<group col="6" colspan="4">
-						<field name="name" select="1" />
-						<field name="code" select="1" />
-						<field name="user_id" select="1" />
-						<field name="business_days" />
-						<field name="date_from" />
-						<field name="date_to" />
-					</group>
-					<notebook colspan="4">
-						<page string="Planning by User">
-						<field colspan="4" name="planning_user_ids"
-								nolabel="1" widget="one2many_list" readonly="1">
-							<tree string="Planning By User (in Days)">
-								<field name="user_id"/>
-								<field name="tasks" sum="Total Remaining Tasks"/>
-								<field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
-								<field name="plan_open" sum="Total Time Allocation without Tasks"/>
-								<field name="holiday" />
-								<field name="free" sum="Total Unallocated Time"/>
-								<field name="timesheet"/>
-							</tree>
-						</field>
-						</page>
-						<page string="Planning by Account">
-						<field colspan="4" name="planning_account"
-								nolabel="1" widget="one2many_list" readonly="1">
-							<tree string="Planning By Account (in Days)">
-								<field name="account_id" />
-								<field name="tasks" sum="Total Remaining Tasks"/>
-								<field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
-								<field name="plan_open" sum="Total Time Allocation without Tasks"/>
-								<field name="timesheet" />
-							</tree>
-						</field>
-						</page>
-						<page string="Time Encoding">
-							<field colspan="4" name="line_ids"
-								nolabel="1">
-								<tree editable="bottom"
-									string="Planning Lines">
-									<field name="user_id"/>
-									<field name="account_id" />
-									<field name="amount" />
-									<field name="amount_unit" />
-									<field name="task_ids" />
-									<field name="note" />
-									<field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
+        <record id="account_analytic_planning_view_form" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.form</field>
+            <field name="model">report_account_analytic.planning</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Planning by Account">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" />
+                        <field name="code" select="1" />
+                        <field name="user_id" select="1" />
+                        <field name="business_days" />
+                        <field name="date_from" />
+                        <field name="date_to" />
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Planning by User">
+                        <field colspan="4" name="planning_user_ids"
+                                nolabel="1" widget="one2many_list" readonly="1">
+                            <tree string="Planning By User (in Days)">
+                                <field name="user_id"/>
+                                <field name="tasks" sum="Total Remaining Tasks"/>
+                                <field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
+                                <field name="plan_open" sum="Total Time Allocation without Tasks"/>
+                                <field name="holiday" />
+                                <field name="free" sum="Total Unallocated Time"/>
+                                <field name="timesheet"/>
+                            </tree>
+                        </field>
+                        </page>
+                        <page string="Planning by Account">
+                        <field colspan="4" name="planning_account"
+                                nolabel="1" widget="one2many_list" readonly="1">
+                            <tree string="Planning By Account (in Days)">
+                                <field name="account_id" />
+                                <field name="tasks" sum="Total Remaining Tasks"/>
+                                <field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
+                                <field name="plan_open" sum="Total Time Allocation without Tasks"/>
+                                <field name="timesheet" />
+                            </tree>
+                        </field>
+                        </page>
+                        <page string="Time Encoding">
+                            <field colspan="4" name="line_ids"
+                                nolabel="1">
+                                <tree editable="bottom"
+                                    string="Planning Lines">
+                                    <field name="user_id"/>
+                                    <field name="account_id" />
+                                    <field name="amount" />
+                                    <field name="amount_unit" />
+                                    <field name="task_ids" />
+                                    <field name="note" />
+                                    <field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
 
-								</tree>
-								<form string="Planning Lines">
-									<field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
-									<field name="account_id" />
-									<field name="amount" />
-									<field name="amount_unit" />
-<!--									WIDGET MANY2MANY GIVES ERROR-->
-<!--									<field name="task_ids" colspan="4" nolabel="1" widget="many2many"/>-->
-                               		<field name="task_ids" colspan="4" nolabel="1" mode="tree,form">
-										<form string="Tasks">
-							                    <group colspan="4" col="2">
-						                        <field name="name" select="1"/>
-						                        <field name="project_id" required="1" select="1" domain="[('category_id','=',parent.account_id)]"/>
-						                    </group>
-						                    <group colspan="4" col="4">
-						                        <field name="date_deadline" select="2"/>
-						                        <field name="user_id" select="1"  domain="[('id','=',parent.user_id)]"/>
-						                    </group>
-						                    <notebook colspan="4">
-						                        <page string="Information">
-						                            <group col="3" colspan="4">
-						                            	<field name="effective_hours" widget="float_time" invisible="True" />
-						                                <field name="planned_hours"
-						                                    widget="float_time"
-						                                    attrs="{'readonly':[('state','!=','draft')]}"
-						                                    on_change="onchange_planned(planned_hours,effective_hours)"/>
-						                                <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"/>
-						                                <button name="%(project.action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
-						                            </group>
-						                            <field colspan="4" name="description" nolabel="1" select="2"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
-						                            <group col="11" colspan="4">
-						                                <field name="state" select="1"/>
-						                                <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
-						                                <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
-						                                <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
-						                                <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-						                                <button groups="base.group_extended" name="%(project.wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-						                                <button name="%(project.wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
-						                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+                                </tree>
+                                <form string="Planning Lines">
+                                    <field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
+                                    <field name="account_id" />
+                                    <field name="amount" />
+                                    <field name="amount_unit" />
+<!--                                    WIDGET MANY2MANY GIVES ERROR-->
+<!--                                    <field name="task_ids" colspan="4" nolabel="1" widget="many2many"/>-->
+                                       <field name="task_ids" colspan="4" nolabel="1" mode="tree,form">
+                                        <form string="Tasks">
+                                                <group colspan="4" col="2">
+                                                <field name="name" select="1"/>
+                                                <field name="project_id" required="1" select="1" domain="[('category_id','=',parent.account_id)]"/>
+                                            </group>
+                                            <group colspan="4" col="4">
+                                                <field name="date_deadline"/>
+                                                <field name="user_id" select="1"  domain="[('id','=',parent.user_id)]"/>
+                                            </group>
+                                            <notebook colspan="4">
+                                                <page string="Information">
+                                                    <group col="3" colspan="4">
+                                                        <field name="effective_hours" widget="float_time" invisible="True" />
+                                                        <field name="planned_hours"
+                                                            widget="float_time"
+                                                            attrs="{'readonly':[('state','!=','draft')]}"
+                                                            on_change="onchange_planned(planned_hours,effective_hours)"/>
+                                                        <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                                        <button name="%(project.action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
+                                                    </group>
+                                                    <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
+                                                    <group col="11" colspan="4">
+                                                        <field name="state" select="1"/>
+                                                        <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
+                                                        <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
+                                                        <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
+                                                        <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
+                                                        <button groups="base.group_extended" name="%(project.wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
+                                                        <button name="%(project.wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
+                                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
 
-						                            </group>
-					                             </page>
-						                        <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
-						                            <group colspan="2" col="2">
-						                                <field name="priority"/>
-						                                <field name="sequence"/>
-						                            </group>
-						                        <separator string="Miscelleanous" colspan="4"/>
-						                            <field name="type"/>
-						                            <field name="active" select="2"/>
-						                            <field name="partner_id" select="2"/>
-						                            <separator colspan="4" string="Notes"/>
-						                            <field colspan="4" name="notes" nolabel="1"/>
-						                        </page>
-						                    </notebook>
-										</form>
-									</field>
-									<separator string="Notes" colspan="4" />
-									<field name="note" colspan="4"
-										nolabel="1" />
-								</form>
-							</field>
-						</page>
-					</notebook>
-					<group col="6" colspan="4">
-						<field name="state" select="1"
-							readonly="1" />
-						<button name="action_open" states="draft"
-							string="Open" type="object" icon="gtk-yes" />
-						<button name="action_done" states="open"
-							string="Done" type="object" icon="gtk-jump-to" />
-						<button name="action_cancel" states="draft,open"
-							string="Cancel" type="object" icon="gtk-cancel" />
-						<button name="action_draft" states="done,cancel"
-							string="Reset to Draft" type="object" icon="gtk-convert" />
-					</group>
-				</form>
-			</field>
-		</record>
+                                                    </group>
+                                                 </page>
+                                                <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
+                                                    <group colspan="2" col="2">
+                                                        <field name="priority"/>
+                                                        <field name="sequence"/>
+                                                    </group>
+                                                <separator string="Miscelleanous" colspan="4"/>
+                                                    <field name="type"/>
+                                                    <field name="active"/>
+                                                    <field name="partner_id"/>
+                                                    <separator colspan="4" string="Notes"/>
+                                                    <field colspan="4" name="notes" nolabel="1"/>
+                                                </page>
+                                            </notebook>
+                                        </form>
+                                    </field>
+                                    <separator string="Notes" colspan="4" />
+                                    <field name="note" colspan="4"
+                                        nolabel="1" />
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
+                    <group col="6" colspan="4">
+                        <field name="state" select="1"
+                            readonly="1" />
+                        <button name="action_open" states="draft"
+                            string="Open" type="object" icon="gtk-yes" />
+                        <button name="action_done" states="open"
+                            string="Done" type="object" icon="gtk-jump-to" />
+                        <button name="action_cancel" states="draft,open"
+                            string="Cancel" type="object" icon="gtk-cancel" />
+                        <button name="action_draft" states="done,cancel"
+                            string="Reset to Draft" type="object" icon="gtk-convert" />
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="account_analytic_planning_view_search" model="ir.ui.view">
-			<field name="name">report.account.analytic.planning.search</field>
-			<field name="model">report_account_analytic.planning</field>
-			<field name="type">search</field>
-			<field name="arch" type="xml">
-				<search string="Planning by Account">
-					<group col="8" colspan="4">
-						<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Plannings"/>
-			        	<filter icon="terp-project" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
-						<separator orientation="vertical"/>
-						<field name="name" select="1"/>
-						<field name="code" select="1"/>
-						<field name="user_id" select="1"/>
-						<field name="state" select="1"/>
-					</group>
-				</search>
-			</field>
-		</record>
+        <record id="account_analytic_planning_view_search" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.search</field>
+            <field name="model">report_account_analytic.planning</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Planning by Account">
+                    <group col="8" colspan="4">
+                        <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Plannings"/>
+                        <filter icon="terp-project" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="state" select="1"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
         <!-- Planning Line -->
 
-		<record id="account_analytic_planning_line_view_tree" model="ir.ui.view">
-			<field name="name">report.account.analytic.planning.line.tree</field>
-			<field name="model">report_account_analytic.planning.line</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Planning Line">
+        <record id="account_analytic_planning_line_view_tree" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.line.tree</field>
+            <field name="model">report_account_analytic.planning.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Planning Line">
                     <field name="planning_id"/>
                     <field name="user_id"/>
                     <field name="account_id" />
@@ -189,16 +189,16 @@
                     <field name="amount_unit" />
                     <field name="note" select="1"/>
                     <field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
-				</tree>
-			</field>
-		</record>
+                </tree>
+            </field>
+        </record>
 
-		<record id="account_analytic_planning_line_view_form" model="ir.ui.view">
-			<field name="name">report.account.analytic.planning.line.form</field>
-			<field name="model">report_account_analytic.planning.line</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Planning Line">
+        <record id="account_analytic_planning_line_view_form" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.line.form</field>
+            <field name="model">report_account_analytic.planning.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Planning Line">
                     <field name="planning_id" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="account_id" select="1"/>
@@ -206,104 +206,104 @@
                     <field name="amount_unit" />
                     <separator string="Notes" colspan="4" />
                     <field name="note" colspan="4" nolabel="1" />
-				</form>
-			</field>
-		</record>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_analytic_planning_form" model="ir.actions.act_window">
-			<field name="name">Plannings</field>
-			<field name="res_model">report_account_analytic.planning</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="search_view_id" ref="account_analytic_planning_view_search"/>
-		</record>
-		<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
-		<menuitem id="planning_main" name="Long Term Planning"
-			parent="base.menu_pm_planning" />
+        <record id="action_account_analytic_planning_form" model="ir.actions.act_window">
+            <field name="name">Plannings</field>
+            <field name="res_model">report_account_analytic.planning</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="account_analytic_planning_view_search"/>
+        </record>
+        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
+        <menuitem id="planning_main" name="Long Term Planning"
+            parent="base.menu_pm_planning" />
 
-		<menuitem action="action_account_analytic_planning_form"
-			id="menu_report_account_analytic_planning" parent="planning_main" />
+        <menuitem action="action_account_analytic_planning_form"
+            id="menu_report_account_analytic_planning" parent="planning_main" />
 
-		<!--
-			Planning statistics
-		-->
-		<record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
-			<field name="name">report.account.analytic.planning.stat.form</field>
-			<field name="model">report_account_analytic.planning.stat</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Planning statistics">
-					<field name="planning_id" select="1" />
-					<field name="user_id" select="1" />
-					<field name="account_id" select="1" />
-				</form>
-			</field>
-		</record>
+        <!--
+            Planning statistics
+        -->
+        <record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.stat.form</field>
+            <field name="model">report_account_analytic.planning.stat</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Planning statistics">
+                    <field name="planning_id" select="1" />
+                    <field name="user_id" select="1" />
+                    <field name="account_id" select="1" />
+                </form>
+            </field>
+        </record>
 
 
-		<record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
-			<field name="name">report.account.analytic.planning.stat.tree</field>
-			<field name="model">report_account_analytic.planning.stat</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Planning statistics">
-					<field name="planning_id" />
-					<field name="user_id" />
-					<field name="manager_id" />
-					<field name="account_id" />
-					<field name="sum_amount" />
-					<field name="sum_amount_real" />
-					<field name="sum_amount_tasks" />
-				</tree>
-			</field>
-		</record>
+        <record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.stat.tree</field>
+            <field name="model">report_account_analytic.planning.stat</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Planning statistics">
+                    <field name="planning_id" />
+                    <field name="user_id" />
+                    <field name="manager_id" />
+                    <field name="account_id" />
+                    <field name="sum_amount" />
+                    <field name="sum_amount_real" />
+                    <field name="sum_amount_tasks" />
+                </tree>
+            </field>
+        </record>
 
-		<record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
-			<field name="name">report.account.analytic.planning.stat.graph</field>
-			<field name="model">report_account_analytic.planning.stat</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Planning statistics" type="bar">
-					<field name="account_id" />
-					<field name="sum_amount" operator="+" />
-					<field name="sum_amount_real" operator="+" />
-					<field name="sum_amount_tasks" operator="+" />
-				</graph>
-			</field>
-		</record>
+        <record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
+            <field name="name">report.account.analytic.planning.stat.graph</field>
+            <field name="model">report_account_analytic.planning.stat</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Planning statistics" type="bar">
+                    <field name="account_id" />
+                    <field name="sum_amount" operator="+" />
+                    <field name="sum_amount_real" operator="+" />
+                    <field name="sum_amount_tasks" operator="+" />
+                </graph>
+            </field>
+        </record>
 
-		<record id="account_analytic_planning_stat_view_search" model="ir.ui.view">
-			<field name="name">report_account_analytic.planning.stat.search</field>
-			<field name="model">report_account_analytic.planning.stat</field>
-			<field name="type">search</field>
-			<field name="arch" type="xml">
-				<search string="Planning statistics">
-					<group col="10" colspan="4">
-						<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="My Plannings Statistics"/>
-						<filter icon="gtk-execute" string="My Project" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="Planning Statistics of My Projects"/>
-			        	<separator orientation="vertical"/>
-						<field name="planning_id" select="1"/>
-						<field name="user_id" select="1"/>
-						<field name="account_id" select="1"/>
-					</group>
-				</search>
-			</field>
-		</record>
+        <record id="account_analytic_planning_stat_view_search" model="ir.ui.view">
+            <field name="name">report_account_analytic.planning.stat.search</field>
+            <field name="model">report_account_analytic.planning.stat</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Planning statistics">
+                    <group col="10" colspan="4">
+                        <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="My Plannings Statistics"/>
+                        <filter icon="gtk-execute" string="My Project" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="Planning Statistics of My Projects"/>
+                        <separator orientation="vertical"/>
+                        <field name="planning_id" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="account_id" select="1"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
 
-		<record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
-			<field name="name">Planning Statistics</field>
-			<field name="res_model">report_account_analytic.planning.stat</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree</field>
-			<field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
-		</record>
-		<menuitem id="next_id_85" name="Planning"
-			parent="hr.menu_hr_reporting" />
-		<menuitem action="action_account_analytic_planning_stat_form"
-			id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
+        <record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
+            <field name="name">Planning Statistics</field>
+            <field name="res_model">report_account_analytic.planning.stat</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="search_view_id" ref="account_analytic_planning_stat_view_search"/>
+        </record>
+        <menuitem id="next_id_85" name="Planning"
+            parent="hr.menu_hr_reporting" />
+        <menuitem action="action_account_analytic_planning_stat_form"
+            id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
 
-<!--		Analytic account Form -->
+<!--        Analytic account Form -->
 
         <record id="view_project_planning_form" model="ir.ui.view">
             <field name="name">planning.account.analytic.account.form</field>
@@ -312,35 +312,35 @@
             <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                	<page string="Planning" >
-                		<separator string="Planning lines"/>
-                		<field name="planning_ids" colspan="4" nolabel="1">
-                			<form string="Planning Lines">
-                				<field name="planning_id" select="1"/>
-								<field name="user_id"/>
-								<field name="amount" />
-								<field name="amount_unit" />
-								<separator string="Notes" colspan="4" />
-                    			<field name="note" colspan="4" nolabel="1" />
-							</form>
-                			<tree editable="bottom"
-									string="Planning Lines">
-									<field name="user_id"/>
-									<field name="account_id" />
-									<field name="amount" />
-									<field name="amount_unit" />
-									<field name="task_ids" />
-									<field name="note" />
-									<field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
-								</tree>
-						</field>
-                	</page>
+                    <page string="Planning" >
+                        <separator string="Planning lines"/>
+                        <field name="planning_ids" colspan="4" nolabel="1">
+                            <form string="Planning Lines">
+                                <field name="planning_id" select="1"/>
+                                <field name="user_id"/>
+                                <field name="amount" />
+                                <field name="amount_unit" />
+                                <separator string="Notes" colspan="4" />
+                                <field name="note" colspan="4" nolabel="1" />
+                            </form>
+                            <tree editable="bottom"
+                                    string="Planning Lines">
+                                    <field name="user_id"/>
+                                    <field name="account_id" />
+                                    <field name="amount" />
+                                    <field name="amount_unit" />
+                                    <field name="task_ids" />
+                                    <field name="note" />
+                                    <field name="amount_in_base_uom" invisible="1" sum="Total Planned (in Days)"/>
+                                </tree>
+                        </field>
+                    </page>
                 </notebook>
             </field>
         </record>
 
 
-<!--		Task Form -->
+<!--        Task Form -->
 
         <record id="view_task_planning_form" model="ir.ui.view">
             <field name="name">planning.task.form</field>
@@ -349,18 +349,18 @@
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <field name="priority" position="before">
-                	<field name="planning_line_id" select="2" domain="['|', ('user_id','=',user_id), ('user_id','=', False)]"/>
+                    <field name="planning_line_id" domain="['|', ('user_id','=',user_id), ('user_id','=', False)]"/>
                 </field>
             </field>
         </record>
 
 <!--Added link to open the list of all tasks planned on all lines of this planning.-->
-		<act_window context="{'planning': active_id}"
-			id="act_task_of_lines" name="Tasks" res_model="project.task"
-			src_model="report_account_analytic.planning"
-		/>
+        <act_window context="{'planning': active_id}"
+            id="act_task_of_lines" name="Tasks" res_model="project.task"
+            src_model="report_account_analytic.planning"
+        />
 
-		<!-- company form -->
+        <!-- company form -->
         <record id="planning_company" model="ir.ui.view">
             <field name="name">res.company.planning.config</field>
             <field name="model">res.company</field>
@@ -374,5 +374,5 @@
             </field>
         </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/project_retro_planning/__terp__.py b/addons/project_retro_planning/__openerp__.py
similarity index 100%
rename from addons/project_retro_planning/__terp__.py
rename to addons/project_retro_planning/__openerp__.py
diff --git a/addons/project_retro_planning/i18n/ar.po b/addons/project_retro_planning/i18n/ar.po
index bab396e1bea..eb19027f631 100644
--- a/addons/project_retro_planning/i18n/ar.po
+++ b/addons/project_retro_planning/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/bg.po b/addons/project_retro_planning/i18n/bg.po
index bab396e1bea..eb19027f631 100644
--- a/addons/project_retro_planning/i18n/bg.po
+++ b/addons/project_retro_planning/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/bs.po b/addons/project_retro_planning/i18n/bs.po
index 4b4053b61fd..eff103ba4f9 100644
--- a/addons/project_retro_planning/i18n/bs.po
+++ b/addons/project_retro_planning/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ca.po b/addons/project_retro_planning/i18n/ca.po
index 0f01680d17d..3c9fc6f0f7d 100644
--- a/addons/project_retro_planning/i18n/ca.po
+++ b/addons/project_retro_planning/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/cs.po b/addons/project_retro_planning/i18n/cs.po
index a9ebacff2f1..38123feb922 100644
--- a/addons/project_retro_planning/i18n/cs.po
+++ b/addons/project_retro_planning/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/de.po b/addons/project_retro_planning/i18n/de.po
index 0d4b80badb5..07bcc7ad6af 100644
--- a/addons/project_retro_planning/i18n/de.po
+++ b/addons/project_retro_planning/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/es.po b/addons/project_retro_planning/i18n/es.po
index 95bc5525de5..ecac27de6ce 100644
--- a/addons/project_retro_planning/i18n/es.po
+++ b/addons/project_retro_planning/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/es_AR.po b/addons/project_retro_planning/i18n/es_AR.po
index 1e2ba557e23..e5da49fefbf 100644
--- a/addons/project_retro_planning/i18n/es_AR.po
+++ b/addons/project_retro_planning/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/et.po b/addons/project_retro_planning/i18n/et.po
index 4d10cd5215e..18a597664ad 100644
--- a/addons/project_retro_planning/i18n/et.po
+++ b/addons/project_retro_planning/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/fr.po b/addons/project_retro_planning/i18n/fr.po
index 02af1abc5b4..250b496e5d3 100644
--- a/addons/project_retro_planning/i18n/fr.po
+++ b/addons/project_retro_planning/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/gl.po b/addons/project_retro_planning/i18n/gl.po
index 57575319967..04d258e1ad5 100644
--- a/addons/project_retro_planning/i18n/gl.po
+++ b/addons/project_retro_planning/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/hr.po b/addons/project_retro_planning/i18n/hr.po
index 9e8c4fb733a..ce3f35f9c08 100644
--- a/addons/project_retro_planning/i18n/hr.po
+++ b/addons/project_retro_planning/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/project_retro_planning/i18n/hu.po b/addons/project_retro_planning/i18n/hu.po
index bab396e1bea..eb19027f631 100644
--- a/addons/project_retro_planning/i18n/hu.po
+++ b/addons/project_retro_planning/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/id.po b/addons/project_retro_planning/i18n/id.po
index ab2c55ebdae..9365463f596 100644
--- a/addons/project_retro_planning/i18n/id.po
+++ b/addons/project_retro_planning/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/it.po b/addons/project_retro_planning/i18n/it.po
index d5c14ff4479..406120cebbf 100644
--- a/addons/project_retro_planning/i18n/it.po
+++ b/addons/project_retro_planning/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ko.po b/addons/project_retro_planning/i18n/ko.po
index 7d6c5af6dd9..1def13d105c 100644
--- a/addons/project_retro_planning/i18n/ko.po
+++ b/addons/project_retro_planning/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/lt.po b/addons/project_retro_planning/i18n/lt.po
index bab396e1bea..eb19027f631 100644
--- a/addons/project_retro_planning/i18n/lt.po
+++ b/addons/project_retro_planning/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/nl.po b/addons/project_retro_planning/i18n/nl.po
index 2f670a4c31a..cbe34ce4852 100644
--- a/addons/project_retro_planning/i18n/nl.po
+++ b/addons/project_retro_planning/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/nl_BE.po b/addons/project_retro_planning/i18n/nl_BE.po
index ffcd641315a..47ae32f0e5b 100644
--- a/addons/project_retro_planning/i18n/nl_BE.po
+++ b/addons/project_retro_planning/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/pl.po b/addons/project_retro_planning/i18n/pl.po
index 0142bdc01ea..3edfe6ebb85 100644
--- a/addons/project_retro_planning/i18n/pl.po
+++ b/addons/project_retro_planning/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/pt.po b/addons/project_retro_planning/i18n/pt.po
index f30bd82e579..1c579b03768 100644
--- a/addons/project_retro_planning/i18n/pt.po
+++ b/addons/project_retro_planning/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/pt_BR.po b/addons/project_retro_planning/i18n/pt_BR.po
index fe4b813bdea..a70756015f7 100644
--- a/addons/project_retro_planning/i18n/pt_BR.po
+++ b/addons/project_retro_planning/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ro.po b/addons/project_retro_planning/i18n/ro.po
index bab396e1bea..eb19027f631 100644
--- a/addons/project_retro_planning/i18n/ro.po
+++ b/addons/project_retro_planning/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ru.po b/addons/project_retro_planning/i18n/ru.po
index ecc5bbb59f6..9ed26d0bb20 100644
--- a/addons/project_retro_planning/i18n/ru.po
+++ b/addons/project_retro_planning/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/sl.po b/addons/project_retro_planning/i18n/sl.po
index ee42e316e08..4ec00a913eb 100644
--- a/addons/project_retro_planning/i18n/sl.po
+++ b/addons/project_retro_planning/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/sv.po b/addons/project_retro_planning/i18n/sv.po
index 96654b05ffb..eb19027f631 100644
--- a/addons/project_retro_planning/i18n/sv.po
+++ b/addons/project_retro_planning/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/tlh.po b/addons/project_retro_planning/i18n/tlh.po
index c3d3fc609a7..8824c2d206e 100644
--- a/addons/project_retro_planning/i18n/tlh.po
+++ b/addons/project_retro_planning/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index f5c81eece9e..a4b91baa764 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/uk.po b/addons/project_retro_planning/i18n/uk.po
index c3d3fc609a7..8824c2d206e 100644
--- a/addons/project_retro_planning/i18n/uk.po
+++ b/addons/project_retro_planning/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/ur.po b/addons/project_retro_planning/i18n/ur.po
index d37edb701d9..c94a464eb06 100644
--- a/addons/project_retro_planning/i18n/ur.po
+++ b/addons/project_retro_planning/i18n/ur.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/zh_CN.po b/addons/project_retro_planning/i18n/zh_CN.po
index ebe59592b95..82aae5ba777 100644
--- a/addons/project_retro_planning/i18n/zh_CN.po
+++ b/addons/project_retro_planning/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/zh_TW.po b/addons/project_retro_planning/i18n/zh_TW.po
index fe4b813bdea..a70756015f7 100644
--- a/addons/project_retro_planning/i18n/zh_TW.po
+++ b/addons/project_retro_planning/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_timesheet/__init__.py b/addons/project_timesheet/__init__.py
index 9dd42114b9c..4d23d3c1a90 100644
--- a/addons/project_timesheet/__init__.py
+++ b/addons/project_timesheet/__init__.py
@@ -20,5 +20,6 @@
 ##############################################################################
 import project_timesheet
 import report
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_timesheet/__terp__.py b/addons/project_timesheet/__openerp__.py
similarity index 100%
rename from addons/project_timesheet/__terp__.py
rename to addons/project_timesheet/__openerp__.py
diff --git a/addons/project_timesheet/i18n/ar.po b/addons/project_timesheet/i18n/ar.po
index 5fa677cdbc9..6e6c72247c8 100644
--- a/addons/project_timesheet/i18n/ar.po
+++ b/addons/project_timesheet/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/bg.po b/addons/project_timesheet/i18n/bg.po
index 5fa677cdbc9..6e6c72247c8 100644
--- a/addons/project_timesheet/i18n/bg.po
+++ b/addons/project_timesheet/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/bs.po b/addons/project_timesheet/i18n/bs.po
index 489218b22d7..0d9582ba1b1 100644
--- a/addons/project_timesheet/i18n/bs.po
+++ b/addons/project_timesheet/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/ca.po b/addons/project_timesheet/i18n/ca.po
index cb23f6dbe41..b91d88c4cf1 100644
--- a/addons/project_timesheet/i18n/ca.po
+++ b/addons/project_timesheet/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/cs.po b/addons/project_timesheet/i18n/cs.po
index 0265c575ab3..9aa951d8782 100644
--- a/addons/project_timesheet/i18n/cs.po
+++ b/addons/project_timesheet/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po
index 00982e362af..25a31cd5917 100644
--- a/addons/project_timesheet/i18n/de.po
+++ b/addons/project_timesheet/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/el.po b/addons/project_timesheet/i18n/el.po
index 47924d9577f..f970c3321eb 100644
--- a/addons/project_timesheet/i18n/el.po
+++ b/addons/project_timesheet/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/project_timesheet/i18n/es.po b/addons/project_timesheet/i18n/es.po
index fda25d29af3..e1d575adb36 100644
--- a/addons/project_timesheet/i18n/es.po
+++ b/addons/project_timesheet/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/es_AR.po b/addons/project_timesheet/i18n/es_AR.po
index b56d026f38b..8121a69b96f 100644
--- a/addons/project_timesheet/i18n/es_AR.po
+++ b/addons/project_timesheet/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/et.po b/addons/project_timesheet/i18n/et.po
index 6cadef5a3e8..6b67bcbf106 100644
--- a/addons/project_timesheet/i18n/et.po
+++ b/addons/project_timesheet/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/fi.po b/addons/project_timesheet/i18n/fi.po
index d2c57915bd6..cf50f5762d8 100644
--- a/addons/project_timesheet/i18n/fi.po
+++ b/addons/project_timesheet/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/fr.po b/addons/project_timesheet/i18n/fr.po
index 6bcd1748f9d..4c786e35e43 100644
--- a/addons/project_timesheet/i18n/fr.po
+++ b/addons/project_timesheet/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/gl.po b/addons/project_timesheet/i18n/gl.po
index 96ee4046c37..dd6bab74639 100644
--- a/addons/project_timesheet/i18n/gl.po
+++ b/addons/project_timesheet/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/hr.po b/addons/project_timesheet/i18n/hr.po
index d203d671ba9..e9fd04112b5 100644
--- a/addons/project_timesheet/i18n/hr.po
+++ b/addons/project_timesheet/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/project_timesheet/i18n/hu.po b/addons/project_timesheet/i18n/hu.po
index 5fa677cdbc9..6e6c72247c8 100644
--- a/addons/project_timesheet/i18n/hu.po
+++ b/addons/project_timesheet/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/id.po b/addons/project_timesheet/i18n/id.po
index f1404707083..56be9bf0d93 100644
--- a/addons/project_timesheet/i18n/id.po
+++ b/addons/project_timesheet/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/it.po b/addons/project_timesheet/i18n/it.po
index 558f316346d..1e4a2f0721a 100644
--- a/addons/project_timesheet/i18n/it.po
+++ b/addons/project_timesheet/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/ko.po b/addons/project_timesheet/i18n/ko.po
index 9a5c5eb4438..4778bc15138 100644
--- a/addons/project_timesheet/i18n/ko.po
+++ b/addons/project_timesheet/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/lt.po b/addons/project_timesheet/i18n/lt.po
index 6fd547d4c32..7241d6a5514 100644
--- a/addons/project_timesheet/i18n/lt.po
+++ b/addons/project_timesheet/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/lv.po b/addons/project_timesheet/i18n/lv.po
index c2140f6f138..be46bcfd34e 100644
--- a/addons/project_timesheet/i18n/lv.po
+++ b/addons/project_timesheet/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/nl.po b/addons/project_timesheet/i18n/nl.po
index 99834f2ca18..6d759faf9ce 100644
--- a/addons/project_timesheet/i18n/nl.po
+++ b/addons/project_timesheet/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/nl_BE.po b/addons/project_timesheet/i18n/nl_BE.po
index 3419757fbe0..3d7c7b72f3e 100644
--- a/addons/project_timesheet/i18n/nl_BE.po
+++ b/addons/project_timesheet/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 166965aedf5..6d000c26b4f 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/pt.po b/addons/project_timesheet/i18n/pt.po
index df39d6be05a..93efaa27525 100644
--- a/addons/project_timesheet/i18n/pt.po
+++ b/addons/project_timesheet/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/pt_BR.po b/addons/project_timesheet/i18n/pt_BR.po
index 56705b5eaef..7e55db25cd6 100644
--- a/addons/project_timesheet/i18n/pt_BR.po
+++ b/addons/project_timesheet/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/ro.po b/addons/project_timesheet/i18n/ro.po
index f2796c8b2c7..6e6c72247c8 100644
--- a/addons/project_timesheet/i18n/ro.po
+++ b/addons/project_timesheet/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/ru.po b/addons/project_timesheet/i18n/ru.po
index 4cd1058b08b..20041f00905 100644
--- a/addons/project_timesheet/i18n/ru.po
+++ b/addons/project_timesheet/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/sl.po b/addons/project_timesheet/i18n/sl.po
index 9e84405f9c7..e75e31b5e9e 100644
--- a/addons/project_timesheet/i18n/sl.po
+++ b/addons/project_timesheet/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/sv.po b/addons/project_timesheet/i18n/sv.po
index 29859f610b9..4de27b69e9f 100644
--- a/addons/project_timesheet/i18n/sv.po
+++ b/addons/project_timesheet/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/tlh.po b/addons/project_timesheet/i18n/tlh.po
index f4adbfcddad..cbf2c236895 100644
--- a/addons/project_timesheet/i18n/tlh.po
+++ b/addons/project_timesheet/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 700b6154da9..1c7cfa258f2 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/uk.po b/addons/project_timesheet/i18n/uk.po
index 7c6bbf1a347..d9157da3565 100644
--- a/addons/project_timesheet/i18n/uk.po
+++ b/addons/project_timesheet/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index b8209d5f356..3a59dd261a4 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/zh_TW.po b/addons/project_timesheet/i18n/zh_TW.po
index 69ef4709b57..a4943a04814 100644
--- a/addons/project_timesheet/i18n/zh_TW.po
+++ b/addons/project_timesheet/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index a6743b10330..3ab09a390cc 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -18,14 +18,14 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import fields, osv
 import time
 import datetime
+
+from osv import fields, osv
 import pooler
 import tools
 from tools.translate import _
 
-
 class project_work(osv.osv):
     _inherit = "project.task.work"
     _description = "Task Work"
@@ -178,12 +178,14 @@ task()
 
 class project_project(osv.osv):
     _inherit = "project.project"
+
     def name_get(self, cr, user, ids, context=None):
         result = []
         for project in self.browse(cr, user, ids, context):
             name = "[%s] %s" % (project.category_id and project.category_id.code or '?', project.name)
             result.append((project.id, name))
         return result
+
 project_project()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index fb6331dda0b..c8ef453666f 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import mx.DateTime
 
 from osv import fields,osv
-import mx.DateTime
 import tools
 
 #class  task_report(osv.osv):
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 2f592e648b0..3b10af43026 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -163,7 +163,7 @@
                 	</group>
                 	<newline/>
                 	<group expand="1" string="Group By..." colspan="4" col="3">
-                	    <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
+                	    <filter string="User" name="by_user" icon="terp-project" context="{'group_by':'user_id'}" />
                     	<filter string="Year" icon="terp-project" context="{'group_by':'year'}" />
                     	<filter string="Month" icon="terp-project" context="{'group_by':'month'}" />
                 	</group>
@@ -175,7 +175,7 @@
             <field name="res_model">report.timesheet.task.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
-            <field name="context">{"search_default_User":1}</field>
+            <field name="context">{"search_default_by_user":1}</field>
             <field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
         </record>
         <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__openerp__.py
similarity index 97%
rename from addons/purchase/__terp__.py
rename to addons/purchase/__openerp__.py
index 8145a12b1b3..6687b330b2c 100644
--- a/addons/purchase/__terp__.py
+++ b/addons/purchase/__openerp__.py
@@ -42,6 +42,7 @@
         'purchase_data.xml',
         'wizard/purchase_order_group_view.xml',
         'wizard/purchase_installer.xml',
+        'wizard/purchase_line_invoice_view.xml',
         'purchase_view.xml',
         'purchase_report.xml',
         'stock_view.xml',
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index e5f5d75fe1f..bd40c155250 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index 9f831b6f0cf..a4975a4a979 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index cd07039ba71..f0af9444a0e 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index 794a95dc571..a51181129ed 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index 97375df99df..b79f099f998 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index f9b90a8e386..822cc697fb9 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-10 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index 61d61b93783..4cc489292d1 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index d96679797cd..39be1bca4d3 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index 2e205077440..23deefcd8fc 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 401f421a537..5123b27b446 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index 8e788618acb..606d291a696 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 0363434b855..22b506b21d8 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index e5f5d75fe1f..eeabe421b2f 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index ad33450d907..0a0ea0504b6 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index 274474898ca..e865bd882a1 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index 3d5dae1e08f..6bff88f6f96 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index f12f6eeac1e..bfd4999485a 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+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 6cb4caeed8a..c30c9b44f03 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index a287c39c45f..d4de5aa7f5e 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index 197a2a1ded2..b18ee563266 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index a8ef608763e..214ea309fba 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 0c498ddc937..2eddbb7af83 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index a509f0d78b6..301881f1737 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index 50ed09460b5..2ab6b15a0be 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index e884b579366..7fc35a5db72 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index a5de8764342..9c65dd816ea 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index 1efc7224bca..fdb512a4036 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index c923c2c19f3..45e02370139 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index 19942e41389..e3adfeedac3 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+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 90bc0460e12..5bc6aed1ffd 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 3ec56760ac8..a2682269e84 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index c471c36b293..7e682c20b2f 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 5757f939392..0a2cbf174b7 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 66337500234..1e88cf50e12 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="priority">36</field>
             <field name="arch" type="xml">
                 <group name="sale_list" position="after" groups="base.group_extended">
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="2" groups="base.group_extended">
                         <separator string="Purchases Properties" colspan="2"/>
                         <field name="property_product_pricelist_purchase"/>
                     </group>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 0dc7926f428..2bcc62c06ac 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -246,6 +246,7 @@ class purchase_order(osv.osv):
         return {'value':{'location_id': res, 'dest_address_id': False}}
 
     def onchange_partner_id(self, cr, uid, ids, part):
+        
         if not part:
             return {'value':{'partner_address_id': False, 'fiscal_position': False}}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
@@ -259,12 +260,18 @@ class purchase_order(osv.osv):
         return True
 
     def wkf_confirm_order(self, cr, uid, ids, context={}):
+        todo = []
         for po in self.browse(cr, uid, ids):
+            
             if self.pool.get('res.partner.event.type').check(cr, uid, 'purchase_open'):
                 self.pool.get('res.partner.event').create(cr, uid, {'name':'Purchase Order: '+po.name, 'partner_id':po.partner_id.id, 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id':uid, 'partner_type':'retailer', 'probability': 1.0, 'planned_cost':po.amount_untaxed})
             if not po.order_line:
                 raise osv.except_osv(_('Error !'),_('You can not confirm purchase order without Purchase Order Lines.'))
+            for line in po.order_line:            
+                if line.state=='draft':
+                    todo.append(line.id)            
         current_name = self.name_get(cr, uid, ids)[0][1]
+        self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
         for id in ids:
             self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
         return True
@@ -312,11 +319,13 @@ class purchase_order(osv.osv):
 
     def action_invoice_create(self, cr, uid, ids, *args):
         res = False
+       
         journal_obj = self.pool.get('account.journal')
         for o in self.browse(cr, uid, ids):
             il = []
+            todo = []
             for ol in o.order_line:
-
+                todo.append(ol.id)
                 if ol.product_id:
                     a = ol.product_id.product_tmpl_id.property_account_expense.id
                     if not a:
@@ -352,7 +361,7 @@ class purchase_order(osv.osv):
             }
             inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'in_invoice'})
             self.pool.get('account.invoice').button_compute(cr, uid, [inv_id], {'type':'in_invoice'}, set_total=True)
-
+            self.pool.get('purchase.order.line').write(cr, uid, todo, {'invoiced':True})
             self.write(cr, uid, [o.id], {'invoice_id': inv_id})
             res = inv_id
         return res
@@ -579,10 +588,22 @@ class purchase_order_line(osv.osv):
         'notes': fields.text('Notes', translate=True),
         'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'),
         'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
-        'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company')
+        'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company'),
+        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', required=True, readonly=True,
+                                  help=' * The \'Draft\' state is set automatically when purchase order in draft state. \
+                                       \n* The \'Confirmed\' state is set automatically as confirm when purchase order in confirm state. \
+                                       \n* The \'Done\' state is set automatically when purchase order is set as done. \
+                                       \n* The \'Cancelled\' state is set automatically when user cancel purchase order.'),
+        'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
+        'invoiced': fields.boolean('Invoiced', readonly=True),
+        'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner"),
+        'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date")
+        
     }
     _defaults = {
-        'product_qty': lambda *a: 1.0
+        'product_qty': lambda *a: 1.0,
+        'state': lambda *args: 'draft',
+        'invoiced': lambda *a: 0,
     }
     _table = 'purchase_order_line'
     _name = 'purchase.order.line'
@@ -590,7 +611,7 @@ class purchase_order_line(osv.osv):
     def copy_data(self, cr, uid, id, default=None,context={}):
         if not default:
             default = {}
-        default.update({'state':'draft', 'move_ids':[]})
+        default.update({'state':'draft', 'move_ids':[],'invoiced':0,'invoice_lines':[]})
         return super(purchase_order_line, self).copy_data(cr, uid, id, default, context)
 
     def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom,
@@ -658,14 +679,17 @@ class purchase_order_line(osv.osv):
         return res
 
     def product_uom_change(self, cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order=False):
+            partner_id, date_order=False,fiscal_position=False):
         res = self.product_id_change(cr, uid, ids, pricelist, product, qty, uom,
-                partner_id, date_order=date_order)
+                partner_id, date_order=date_order,fiscal_position=fiscal_position)
         if 'product_uom' in res['value']:
             del res['value']['product_uom']
         if not uom:
             res['value']['price_unit'] = 0.0
         return res
+    def action_confirm(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state': 'confirmed'}, context)
+        return True    
 purchase_order_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 653238748b9..75f1a4d5e8d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -20,7 +20,7 @@
       <menuitem id="menu_procurement_management_nventory" name="Inventory Control"
             parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_nventory"
-              name="Incoming shipments" sequence="9"/>
+              name="Incoming Shipments" sequence="9"/>
         <menuitem action="stock.action_reception_picking_move" id="menu_action_reception_picking_move"
               name="Incoming Products" parent="menu_procurement_management_nventory" sequence="10"/>
 
@@ -69,20 +69,20 @@
                 <form string="Purchase Order">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="date_order" select="2"/>
-                        <field name="invoiced" select="2"/>
+                        <field name="date_order"/>
+                        <field name="invoiced"/>
                         <newline/>
                         <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
-                        <field name="origin" select="2"/>
-                        <field name="shipped" select="2"/>
+                        <field name="origin"/>
+                        <field name="shipped"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Purchase Order">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" domain="[('supplier','=', 1)]"/>
                             <field name="partner_address_id"/>
-                            <field domain="[('type','=','purchase')]" name="pricelist_id"/>
-                            <field name="partner_ref" select="2"/>
+                            <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
+                            <field name="partner_ref"/>
                             <newline/>
                             <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
                                 <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
@@ -92,7 +92,9 @@
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
                                     <field name="price_unit"/>
-                                    <field name="price_subtotal"/>
+ 									<field name="price_subtotal" groups="base.group_extended"/>
+                                    <field name="invoiced"/>
+                        			<field name="state"/>                                    
                                 </tree>
                                 <!-- default form view -->
                             </field>
@@ -116,17 +118,17 @@
                             </group>
                         </page>
                         <page string="Delivery &amp; Invoices" groups="account.group_account_user">
-                            <group colspan="2" col="2">
+                            <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Delivery" colspan="2"/>
                                 <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
                                 <field name="minimum_planned_date"/>
-                                <field name="location_id" widget="selection"/>
+                                <field name="location_id"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Invoice Control" colspan="2"/>
                                 <field name="invoice_method"/>
-                                <field name="invoice_id" readonly="1"/>
-                                <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                                <field name="invoice_id" readonly="1" groups="base.group_extended"/>
+                                <field name="fiscal_position" widget="selection"/>
                             </group>
                             <newline/>
                             <separator string="Purchase Control" colspan="4"/>
@@ -148,8 +150,10 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
-                    <filter icon="terp-purchase" string="Unapproved" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
+                    <filter icon="terp-purchase" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
+                    <filter icon="terp-purchase" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
+                    <filter icon="terp-purchase" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1"/>
+                    <filter icon="terp-purchase" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
                     <separator orientation="vertical"/>
@@ -169,38 +173,6 @@
               </search>
             </field>
         </record>
-
-        <record id="purchase_rfq" model="ir.actions.act_window">
-            <field name="name">Quotation Request</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('state','=','draft')]</field>
-            <field name="view_mode">tree,form</field>  
-            <field name="search_view_id" ref="view_purchase_order_filter"/>          
-        </record>
-        <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management" 
-                name="Request for Quotations" sequence="6"/>
-
-        <record id="purchase_form_action" model="ir.actions.act_window">
-            <field name="name">Purchase Orders</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>
-        </record>
-        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
-
-        <record id="purchase_form_action4" model="ir.actions.act_window">
-            <field name="name">Purchase Orders in Progress</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','approved')]</field>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>
-        </record>
-
         <record id="purchase_order_tree" model="ir.ui.view">
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.order</field>
@@ -208,21 +180,42 @@
             <field name="arch" type="xml">
                 <tree string="Purchase Order">
                     <field name="name" string="Reference"/>
-                    <field name="origin"/>
                     <field name="date_order" string="Order Date"/>
                     <field name="partner_id"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="location_id"/>
                     <field name="minimum_planned_date"/>
+                    <field name="origin"/>
                     <field name="invoiced_rate" widget="progressbar"/>
                     <field name="shipped_rate" widget="progressbar"/>
-                    <field name="amount_untaxed" sum="Total Untaxed amount"/>                               
+                    <field name="amount_untaxed" sum="Total Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
 
+        <record id="purchase_rfq" model="ir.actions.act_window">
+            <field name="name">Requests for Quotation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_type">form</field>
+            <field name="context">{'search_default_draft': 1}</field>
+            <field name="view_mode">tree,form,graph,calendar</field>
+        </record>
+        <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management" 
+                sequence="6"/>
+
+        <record id="purchase_form_action" model="ir.actions.act_window">
+            <field name="name">Purchase Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_mode">tree,form,graph,calendar</field>
+            <field name="context">{'search_default_approved': 1}</field>
+        </record>
+        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
+
+
         <record id="purchase_order_line_form" model="ir.ui.view">
             <field name="name">purchase.order.line.form</field>
             <field name="model">purchase.order.line</field>
@@ -233,7 +226,7 @@
                         <page string="Order Line">
                             <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
                             <field context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes)"/>
-                            <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
+                            <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position)"/>
                             <field colspan="4" name="name"/>
                             <field name="date_planned" widget="date"/>
                             <field name="price_unit"/>
@@ -243,16 +236,23 @@
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
-                        <page string="History" groups="base.group_extended,stock.group_stock_user">
+                        <page string="History" groups="base.group_extended">
                                <separator colspan="4" string="Stock Moves"/>
                                <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
                         </page>
-                        <page string="Invoicing" groups="account.group_account_user">
+                        <page string="Invoicing" groups="base.group_extended">
                             <field name="account_analytic_id" colspan="4"/>
                             <separator colspan="4" string="Taxes"/>
                             <field colspan="4" nolabel="1" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+	                        <separator colspan="4" string="Manual Invoices"/>
+	                        <field name="invoiced"/>
+	                        <newline/>
+	                        <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>                            
                         </page>
                     </notebook>
+					<group>
+						<field name="state" />
+                    </group>                    
                 </form>
             </field>
         </record>
@@ -271,6 +271,7 @@
                     <field name="product_uom"/>
                     <field name="price_unit"/>
                     <field name="price_subtotal"/>
+                    <field name="invoiced"/>
                 </tree>
             </field>
         </record>
@@ -299,5 +300,48 @@
                 <field name="model">purchase.order</field>
          </record>
           -->
+        <record id="purchase_line_form_action" model="ir.actions.act_window">
+            <field name="name">Purchase Order Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order.line</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <record id="purchase_line_form_action_tree" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="purchase_order_line_tree"/>
+            <field name="act_window_id" ref="purchase_line_form_action"/>
+        </record>
+        <record id="purchase_line_form_action_form" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="purchase_order_line_form"/>
+            <field name="act_window_id" ref="purchase_line_form_action"/>
+        </record>
+        <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="base.menu_purchase_root"/>
+
+        <record id="purchase_line_form_action2" model="ir.actions.act_window">
+            <field name="name">Uninvoiced Purchase Order Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order.line</field>
+            <field name="domain">[('state','in',('confirmed','done')), ('invoiced','=',False)]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="purchase_order_line_tree"/>
+            <field name="act_window_id" ref="purchase_line_form_action2"/>
+        </record>
+        <record id="purchase_line_form_action_form2" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="purchase_order_line_form"/>
+            <field name="act_window_id" ref="purchase_line_form_action2"/>
+        </record>
+         <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_purchase_line_form_action"/>
+          
+
     </data>
 </openerp>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index ac9abaaf590..f5c0a09b95d 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -46,7 +46,7 @@ class report_purchase_order(osv.osv):
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
         'category_id': fields.many2one('product.category', 'Categories', readonly=True),
-        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
+        'partner_id':fields.many2one('res.partner', 'Supplier', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
         'quantity': fields.float('# of Products', readonly=True),
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 1e5a355b8f0..7946d99ba37 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -46,11 +46,11 @@
             <search string="Purchase Orders">
                 <group>
                 <filter icon="terp-purchase"
-                    string="This Year"
+                    string="This Year" name="this_year"
                     domain="[('name','=',time.strftime('%%Y'))]"
                     help="Purchase orders of the year"/>
                 <filter icon="terp-purchase"
-                    string="This Month"
+                    string="This Month" name="this_month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Purchase orders of this month"/>
                 <separator orientation="vertical"/>
@@ -58,7 +58,7 @@
                     string="Quotations"
                     domain="[('state','=','draft')]"/>
                 <filter icon="terp-purchase"
-                    string="Purchase"
+                    string="Purchase" name="purchase"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
@@ -74,11 +74,11 @@
                 <group expand="1" string="Group By...">
                     <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}"/>
                     <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
-                    <filter string="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
+                    <filter string="Responsible" name="by_user" icon="terp-purchase" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                    <filter string="Product" name="by_product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
                     <filter string="Product Category" icon="terp-purchase" context="{'group_by':'category_id'}"/>
-                    <filter string="Partner" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
+                    <filter string="Supplier" name="by_partner" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
                     <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Month" icon="terp-purchase" context="{'group_by':'date'}"/>
@@ -93,7 +93,7 @@
         <field name="res_model">report.purchase.order</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_This Year":1,"search_default_This Month":1,"search_default_Purchase":1,"search_default_Responsible":1}</field>
+        <field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_purchase":1,"search_default_by_product":1}</field>
         <field name="search_view_id" ref="view_purchase_order_search"/>
     </record>
 
diff --git a/addons/purchase/wizard/__init__.py b/addons/purchase/wizard/__init__.py
index bd42391f980..dbc3fc5e31b 100644
--- a/addons/purchase/wizard/__init__.py
+++ b/addons/purchase/wizard/__init__.py
@@ -21,5 +21,6 @@
 
 import purchase_order_group
 import purchase_installer
+import purchase_line_invoice
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
index 4060d241c22..da2c3f41cca 100644
--- a/addons/purchase/wizard/purchase_installer.py
+++ b/addons/purchase/wizard/purchase_installer.py
@@ -25,7 +25,7 @@ class purchase_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'purchase_tender':fields.boolean('Purchase Tender'),
+        'purchase_requisition':fields.boolean('Purchase Requisition'),
         }
 purchase_installer()
 
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 7949564187e..efa8ec19887 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -2,23 +2,23 @@
 <openerp>
     <data>
         <record id="view_purchase_install_module_form" model="ir.ui.view">
-            <field name="name">Purchase Tender</field>
+            <field name="name">Purchase Requisition</field>
             <field name="model">purchase.installer</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Install Extra Modules</attribute>
+                  <attribute name="string">Purchase Modules Installation</attribute>
                 </form>
                 <xpath expr="//label[@string='description']"
                        position="attributes">
-                  <attribute name="string"> This module allows you to manage your Purchase Tenders.</attribute>
+                  <attribute name="string"> This module allows you to manage your Purchase Requisition.</attribute>
                 </xpath>
                 <separator string="title" position="replace"/>
                 <group colspan="8">
-                  <separator string="Purchase Tender" colspan="4"/>
-                  <field name="purchase_tender"/>
+                  <separator string="Purchase Requisition" colspan="4"/>
+                  <field name="purchase_requisition"/>
                 </group>
               </data>
             </field>
@@ -36,7 +36,7 @@
 
 	<record id="purchase_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_purchase_install_module"/>
-      <field name="sequence">2</field>
+      <field name="sequence">3</field>
     
     </record>
     </data>
diff --git a/addons/purchase_manual/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
similarity index 100%
rename from addons/purchase_manual/wizard/purchase_line_invoice.py
rename to addons/purchase/wizard/purchase_line_invoice.py
diff --git a/addons/purchase_manual/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
similarity index 100%
rename from addons/purchase_manual/wizard/purchase_line_invoice_view.xml
rename to addons/purchase/wizard/purchase_line_invoice_view.xml
diff --git a/addons/purchase_analytic_plans/__terp__.py b/addons/purchase_analytic_plans/__openerp__.py
similarity index 100%
rename from addons/purchase_analytic_plans/__terp__.py
rename to addons/purchase_analytic_plans/__openerp__.py
diff --git a/addons/purchase_analytic_plans/i18n/ar.po b/addons/purchase_analytic_plans/i18n/ar.po
index 9baa0d4c19e..79e70e1c2c6 100644
--- a/addons/purchase_analytic_plans/i18n/ar.po
+++ b/addons/purchase_analytic_plans/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/bg.po b/addons/purchase_analytic_plans/i18n/bg.po
index 0c077268451..515caa1920f 100644
--- a/addons/purchase_analytic_plans/i18n/bg.po
+++ b/addons/purchase_analytic_plans/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/bs.po b/addons/purchase_analytic_plans/i18n/bs.po
index 11b35bf094d..041e8fc5fdb 100644
--- a/addons/purchase_analytic_plans/i18n/bs.po
+++ b/addons/purchase_analytic_plans/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/ca.po b/addons/purchase_analytic_plans/i18n/ca.po
index c783f68a9f2..10f2d03cc74 100644
--- a/addons/purchase_analytic_plans/i18n/ca.po
+++ b/addons/purchase_analytic_plans/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/cs.po b/addons/purchase_analytic_plans/i18n/cs.po
index 44995511f92..92b4ef27231 100644
--- a/addons/purchase_analytic_plans/i18n/cs.po
+++ b/addons/purchase_analytic_plans/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/de.po b/addons/purchase_analytic_plans/i18n/de.po
index d71aa133aa2..d80e9917699 100644
--- a/addons/purchase_analytic_plans/i18n/de.po
+++ b/addons/purchase_analytic_plans/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/el.po b/addons/purchase_analytic_plans/i18n/el.po
index b7c3b296f2a..bcdaf82c322 100644
--- a/addons/purchase_analytic_plans/i18n/el.po
+++ b/addons/purchase_analytic_plans/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/purchase_analytic_plans/i18n/es.po b/addons/purchase_analytic_plans/i18n/es.po
index b2b543bcb4a..804fcdea5f2 100644
--- a/addons/purchase_analytic_plans/i18n/es.po
+++ b/addons/purchase_analytic_plans/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/es_AR.po b/addons/purchase_analytic_plans/i18n/es_AR.po
index 378d00c36e2..0a554905e87 100644
--- a/addons/purchase_analytic_plans/i18n/es_AR.po
+++ b/addons/purchase_analytic_plans/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/et.po b/addons/purchase_analytic_plans/i18n/et.po
index 1bc86d7b0d2..a8712401c6d 100644
--- a/addons/purchase_analytic_plans/i18n/et.po
+++ b/addons/purchase_analytic_plans/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/fr.po b/addons/purchase_analytic_plans/i18n/fr.po
index 6c322f83a5d..684470cb0ee 100644
--- a/addons/purchase_analytic_plans/i18n/fr.po
+++ b/addons/purchase_analytic_plans/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/gl.po b/addons/purchase_analytic_plans/i18n/gl.po
index e43e4e9b91a..f7c0ac3a24c 100644
--- a/addons/purchase_analytic_plans/i18n/gl.po
+++ b/addons/purchase_analytic_plans/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/hr.po b/addons/purchase_analytic_plans/i18n/hr.po
index ee518cfe370..abd5fb8755c 100644
--- a/addons/purchase_analytic_plans/i18n/hr.po
+++ b/addons/purchase_analytic_plans/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/hu.po b/addons/purchase_analytic_plans/i18n/hu.po
index 9baa0d4c19e..79e70e1c2c6 100644
--- a/addons/purchase_analytic_plans/i18n/hu.po
+++ b/addons/purchase_analytic_plans/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/id.po b/addons/purchase_analytic_plans/i18n/id.po
index 662e3ca93a8..431bd1d8cdf 100644
--- a/addons/purchase_analytic_plans/i18n/id.po
+++ b/addons/purchase_analytic_plans/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/it.po b/addons/purchase_analytic_plans/i18n/it.po
index c41e1ee1c80..7358fab9ab9 100644
--- a/addons/purchase_analytic_plans/i18n/it.po
+++ b/addons/purchase_analytic_plans/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/ko.po b/addons/purchase_analytic_plans/i18n/ko.po
index 78c5557b830..0f355b081ae 100644
--- a/addons/purchase_analytic_plans/i18n/ko.po
+++ b/addons/purchase_analytic_plans/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/lt.po b/addons/purchase_analytic_plans/i18n/lt.po
index 9baa0d4c19e..79e70e1c2c6 100644
--- a/addons/purchase_analytic_plans/i18n/lt.po
+++ b/addons/purchase_analytic_plans/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/nl.po b/addons/purchase_analytic_plans/i18n/nl.po
index ed6a501f28c..f601b75fdec 100644
--- a/addons/purchase_analytic_plans/i18n/nl.po
+++ b/addons/purchase_analytic_plans/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/nl_BE.po b/addons/purchase_analytic_plans/i18n/nl_BE.po
index 751c58af557..7afae446a11 100644
--- a/addons/purchase_analytic_plans/i18n/nl_BE.po
+++ b/addons/purchase_analytic_plans/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/pl.po b/addons/purchase_analytic_plans/i18n/pl.po
index a116fec31e2..2d97bc9ba82 100644
--- a/addons/purchase_analytic_plans/i18n/pl.po
+++ b/addons/purchase_analytic_plans/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/pt.po b/addons/purchase_analytic_plans/i18n/pt.po
index 7981f6f1d70..0d582dc489c 100644
--- a/addons/purchase_analytic_plans/i18n/pt.po
+++ b/addons/purchase_analytic_plans/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/pt_BR.po b/addons/purchase_analytic_plans/i18n/pt_BR.po
index 2875f2648e9..65d95ea606f 100644
--- a/addons/purchase_analytic_plans/i18n/pt_BR.po
+++ b/addons/purchase_analytic_plans/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/ro.po b/addons/purchase_analytic_plans/i18n/ro.po
index 0b399799144..91d6abf3c67 100644
--- a/addons/purchase_analytic_plans/i18n/ro.po
+++ b/addons/purchase_analytic_plans/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/ru.po b/addons/purchase_analytic_plans/i18n/ru.po
index b2a1dbe547e..0102cc4deea 100644
--- a/addons/purchase_analytic_plans/i18n/ru.po
+++ b/addons/purchase_analytic_plans/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/sl.po b/addons/purchase_analytic_plans/i18n/sl.po
index 7d13f76b47c..15f5149f5ac 100644
--- a/addons/purchase_analytic_plans/i18n/sl.po
+++ b/addons/purchase_analytic_plans/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/sv.po b/addons/purchase_analytic_plans/i18n/sv.po
index 9baa0d4c19e..79e70e1c2c6 100644
--- a/addons/purchase_analytic_plans/i18n/sv.po
+++ b/addons/purchase_analytic_plans/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/tlh.po b/addons/purchase_analytic_plans/i18n/tlh.po
index 95dc9b662b8..458dd83c5b4 100644
--- a/addons/purchase_analytic_plans/i18n/tlh.po
+++ b/addons/purchase_analytic_plans/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index be0ec6c9ed2..43bfbce2e58 100644
--- a/addons/purchase_analytic_plans/i18n/tr.po
+++ b/addons/purchase_analytic_plans/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/uk.po b/addons/purchase_analytic_plans/i18n/uk.po
index 75f1dfd0d6f..2b2bd6f1755 100644
--- a/addons/purchase_analytic_plans/i18n/uk.po
+++ b/addons/purchase_analytic_plans/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/ur.po b/addons/purchase_analytic_plans/i18n/ur.po
index efb09db73d8..7804b999d8a 100644
--- a/addons/purchase_analytic_plans/i18n/ur.po
+++ b/addons/purchase_analytic_plans/i18n/ur.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/zh_CN.po b/addons/purchase_analytic_plans/i18n/zh_CN.po
index 54005c01ac4..57568e14aa1 100644
--- a/addons/purchase_analytic_plans/i18n/zh_CN.po
+++ b/addons/purchase_analytic_plans/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/zh_TW.po b/addons/purchase_analytic_plans/i18n/zh_TW.po
index 131b1d5858f..ac53e7388b7 100644
--- a/addons/purchase_analytic_plans/i18n/zh_TW.po
+++ b/addons/purchase_analytic_plans/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
index 9d0ac4c06cf..498ceb2bd0a 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
@@ -2,17 +2,17 @@
 <openerp>
 <data>
 
-	<record model="ir.ui.view" id="purchase_order_line_form_inherit">
-		<field name="name">purchase.order.line.form.inherit</field>
-		<field name="model">purchase.order.line</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="purchase.purchase_order_line_form"/>
-		<field name="arch" type="xml">
-			<field name="account_analytic_id" position="replace">
-				<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="purchase_order_line_form_inherit">
+        <field name="name">purchase.order.line.form.inherit</field>
+        <field name="model">purchase.order.line</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+            </field>
+        </field>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/purchase_manual/__init__.py b/addons/purchase_manual/__init__.py
deleted file mode 100644
index 9409cb3b358..00000000000
--- a/addons/purchase_manual/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import purchase_manual
-import wizard
-
diff --git a/addons/purchase_manual/purchase_manual.py b/addons/purchase_manual/purchase_manual.py
deleted file mode 100644
index f31b96f4c8a..00000000000
--- a/addons/purchase_manual/purchase_manual.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields
-from osv import osv
-import netsvc
-
-class purchase_order_line(osv.osv):
-    _inherit='purchase.order.line'
-    _columns = {
-        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', required=True, readonly=True,
-                                  help=' * The \'Draft\' state is set automatically when purchase order in draft state. \
-                                       \n* The \'Confirmed\' state is set automatically as confirm when purchase order in confirm state. \
-                                       \n* The \'Done\' state is set automatically when purchase order is set as done. \
-                                       \n* The \'Cancelled\' state is set automatically when user cancel purchase order.'),
-        'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
-        'invoiced': fields.boolean('Invoiced', readonly=True),
-        'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner"),
-        'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date")
-    }
-    _defaults = {
-        'state': lambda *args: 'draft',
-        'invoiced': lambda *a: 0,
-
-    }
-    def copy_data(self, cr, uid, id, default=None, context={}):
-        print 'copy called'
-        if not default:
-            default = {}
-        default.update({
-            'state':'draft',
-            'invoiced':0,
-            'invoice_lines':[],
-        })
-        return super(purchase_order_line, self).copy_data(cr, uid, id, default, context)
- 
-    def action_confirm(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state': 'confirmed'}, context)
-        return True
-purchase_order_line()
-
-class purchase_order(osv.osv):
-    _inherit='purchase.order'
-    def action_invoice_create(self, cr, uid, ids, context={}):
-        print 'Invoice Create'
-        res = super(purchase_order, self).action_invoice_create(cr, uid, ids, context)
-        for po in self.browse(cr, uid, ids, context):
-            todo = []
-            for line in po.order_line:
-                todo.append(line.id)
-            self.pool.get('purchase.order.line').write(cr, uid, todo, {'invoiced':True}, context)
-        return res
-
-    def wkf_confirm_order(self, cr, uid, ids, context={}):
-        res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context)
-        todo = []
-        for po in self.browse(cr, uid, ids, context):
-            for line in po.order_line:
-                if line.state=='draft':
-                    todo.append(line.id)
-        self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
-        return res
-purchase_order()
diff --git a/addons/purchase_manual/purchase_manual_view.xml b/addons/purchase_manual/purchase_manual_view.xml
deleted file mode 100644
index 7d97cca7512..00000000000
--- a/addons/purchase_manual/purchase_manual_view.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        #
-        # Define PO Line Views
-        #
-
-        <record id="purchase_order_form" model="ir.ui.view">
-            <field name="name">purchase.order.form</field>
-            <field name="model">purchase.order</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="purchase.purchase_order_form"/>
-            <field name="arch" type="xml">
-                    <xpath expr="/form/notebook/page[@string='Purchase Order']/field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
-                        <field name="invoiced"/>
-                        <field name="state"/>
-                    </xpath>
-            </field>
-        </record>
-
-        <record id="purchase_order_line_form" model="ir.ui.view">
-            <field name="name">purchase.order.line.form</field>
-            <field name="model">purchase.order.line</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
-            <field name="priority">17</field>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="/form/notebook/page[@string='Invoicing']" position="inside">
-                        <separator colspan="4" string="Manual Invoices"/>
-                        <field name="invoiced"/>
-                        <newline/>
-                        <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
-                    </xpath>
-                    <xpath expr="/form/notebook" position="after">
-                        <group>
-                            <field name="state" />
-                        </group>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <record id="purchase_order_line_tree" model="ir.ui.view">
-            <field name="name">purchase.order.line.tree</field>
-            <field name="model">purchase.order.line</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="purchase.purchase_order_line_tree"/>
-            <field name="arch" type="xml">
-                <field name="price_subtotal" position="after">
-                    <field name="invoiced"/>
-                </field>
-            </field>
-        </record>
-
-
-        #
-        # Inherit PO view to get buttons
-        #
-
-        <record id="purchase_line_form_action" model="ir.actions.act_window">
-            <field name="name">Purchase Order Lines</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order.line</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <record id="purchase_line_form_action_tree" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="purchase_order_line_tree"/>
-            <field name="act_window_id" ref="purchase_line_form_action"/>
-        </record>
-        <record id="purchase_line_form_action_form" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="purchase_order_line_form"/>
-            <field name="act_window_id" ref="purchase_line_form_action"/>
-        </record>
-        <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="base.menu_purchase_root"/>
-
-        <record id="purchase_line_form_action2" model="ir.actions.act_window">
-            <field name="name">Uninvoiced Purchase Order Lines</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order.line</field>
-            <field name="domain">[('state','in',('confirmed','done')), ('invoiced','=',False)]</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="purchase_order_line_tree"/>
-            <field name="act_window_id" ref="purchase_line_form_action2"/>
-        </record>
-        <record id="purchase_line_form_action_form2" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="purchase_order_line_form"/>
-            <field name="act_window_id" ref="purchase_line_form_action2"/>
-        </record>
-         <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_purchase_line_form_action"/>
-
-    </data>
-</openerp>
diff --git a/addons/purchase_tender/__init__.py b/addons/purchase_requisition/__init__.py
similarity index 97%
rename from addons/purchase_tender/__init__.py
rename to addons/purchase_requisition/__init__.py
index 9fc02d11b87..ea44f749bbf 100644
--- a/addons/purchase_tender/__init__.py
+++ b/addons/purchase_requisition/__init__.py
@@ -17,7 +17,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import purchase_tender
+
+import purchase_requisition
 import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase_tender/__terp__.py b/addons/purchase_requisition/__openerp__.py
similarity index 76%
rename from addons/purchase_tender/__terp__.py
rename to addons/purchase_requisition/__openerp__.py
index 763f3bceecb..c5a9435379c 100644
--- a/addons/purchase_tender/__terp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -18,27 +18,23 @@
 #
 ##############################################################################
 {
-    "name" : "Purchase - Purchase Tender",
+    "name" : "Purchase - Purchase Requisition",
     "version" : "0.1",
     "author" : "Tiny",
     "category" : "Generic Modules/Sales & Purchases",
     "website" : "http://www.openerp.com",
     "description": """
-    This module allows you to manage your Purchase Tenders.
-    When a purchase order is created, you now have the opportunity to save the related tender.
+    This module allows you to manage your Purchase Requisition.
+    When a purchase order is created, you now have the opportunity to save the related requisition.
     This new object will regroup and will allow you to easily keep track and order all your purchase orders.
 """,
     "depends" : ["purchase","mrp"],
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : [
-                    "wizard//purchase_tender_partner.xml",
-                    "purchase_tender_view.xml",
-                    "security/purchase_tender.xml",   
-                    "security/ir.model.access.csv",
-                    "purchase_tender_sequence.xml",
-                   
-                    ],
+    "update_xml" : ["wizard/purchase_requisition_partner_view.xml",
+                    "purchase_requisition_view.xml",
+                    "security/ir.model.access.csv","purchase_requisition_sequence.xml"],
+
     "active": False,
     "installable": True
 }
diff --git a/addons/purchase_requisition/i18n/fr_BE.po b/addons/purchase_requisition/i18n/fr_BE.po
new file mode 100644
index 00000000000..964e58391a2
--- /dev/null
+++ b/addons/purchase_requisition/i18n/fr_BE.po
@@ -0,0 +1,134 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_requisition
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-25 14:07:40+0000\n"
+"PO-Revision-Date: 2009-11-25 14:07:40+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_requisition
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML incorrect pour l'Architecture des Vues!"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Date End"
+msgstr "Date de fin"
+
+#. module: purchase_requisition
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "Le nom de l'Objet doit commencer par x_ et ne pas comporter de caractères spéciaux !"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+msgid "Purchase requisition"
+msgstr "Appel d'Offre"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition
+msgid "Purchase requisitions"
+msgstr "Appels d'offre"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Open"
+msgstr "Ouvert"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_draft
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_draft
+msgid "Draft Purchase requisitions"
+msgstr "Appels d'Offre brouillons"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Etat"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Brouillon"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_open
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_open
+msgid "Open Purchase requisitions"
+msgstr "Appels d'offre ouverts"
+
+#. module: purchase_requisition
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom de modèle incorrect pour la définition de l'action"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase requisition"
+msgstr "Achat - Appel d'offre"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,name:0
+msgid "requisition Reference"
+msgstr "Référence"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Close"
+msgstr "Clôturé"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_start:0
+msgid "Date Start"
+msgstr "Date de début"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid " This module allows you to manage your Purchase requisitions. When a purchase order is created, you now have the opportunity to save the related requisition. \n"
+"    This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
+""
+msgstr "Ce module vous permet de gérer des appels d'offre. Quand un appel d'offre est créé, vous avez maintenant l'opportunité de conserver une trace. \n"
+"    Ce nouvel objet regroupe et conserve la trace de tous vos appels d'offre.\n"
+""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_new
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_new
+msgid "New Purchase requisitions"
+msgstr "Nouveaux Appels d'Offre"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Bons d'achat"
+
diff --git a/addons/purchase_tender/purchase_tender.py b/addons/purchase_requisition/purchase_requisition.py
similarity index 68%
rename from addons/purchase_tender/purchase_tender.py
rename to addons/purchase_requisition/purchase_requisition.py
index 54732571bce..a1e295b1c58 100644
--- a/addons/purchase_tender/purchase_tender.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -25,28 +25,31 @@ from osv import orm
 import netsvc
 import time
 
-class purchase_tender(osv.osv):
-    _name = "purchase.tender"
-    _description="Purchase Tender"
+class purchase_requisition(osv.osv):
+    _name = "purchase.requisition"
+    _description="Purchase requisition"
     _columns = {
-        'name': fields.char('Tender Reference', size=32,required=True),
-        'date_start': fields.datetime('Date Start'),
-        'date_end': fields.datetime('Date End',readonly=True),
+        'name': fields.char('Requisition Reference', size=32,required=True),
+        'origin': fields.char('Origin', size=32),
+        'date_start': fields.datetime('Requisition Date'),
+        'date_end': fields.datetime('Requisition Deadline'),
         'user_id': fields.many2one('res.users', 'Responsible'),
-        'exclusive': fields.boolean('Exclusive', help="If the tender is exclusive, it will cancel all purchase orders when you confirm one of them"),
+        'exclusive': fields.selection([('exclusive','Purchase Tender (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', help="If the requisition is exclusive, it will cancel all purchase orders when you confirm one of them", required=True),
         'description': fields.text('Description'),
-        'purchase_ids' : fields.one2many('purchase.order','tender_id','Purchase Orders'),
-        'line_ids' : fields.one2many('purchase.tender.line','tender_id','Products to Purchase'),
         'company_id': fields.many2one('res.company', 'Company', required=True),        
-        'state': fields.selection([('draft','Draft'),('open','Open'),('cancel','Cancel'),('close','Close'),('in_progress','In progress'),('done','Done')], 'State', required=True)
+        'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders'),
+        'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase'),
+        'state': fields.selection([('draft','Draft'),('open','Open'),('cancel','Cancelled'),('close','Close'),('done','Done')], 'State', required=True)
     }
     _defaults = {
         'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'user_id': lambda obj, cr, uid, context: uid,
         'state': lambda *args: 'open',
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.tender'),
+        'exclusive': lambda *args: 'multiple',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+        'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id ,       
+        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
     }
+
     def tender_close(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'done', 'date_end': time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
@@ -73,18 +76,20 @@ class purchase_tender(osv.osv):
         return True     
     
       
-purchase_tender()
 
-class purchase_tender_line(osv.osv):
-    _name = "purchase.tender.line"
-    _description="Purchase Tender Line"
+purchase_requisition()
+
+class purchase_requisition_line(osv.osv):
+    _name = "purchase.requisition.line"
+    _description="Purchase Requisition Line"
     _rec_name = 'product_id'
     _columns = {
         'product_id': fields.many2one('product.product', 'Product'),
         'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
         'product_qty': fields.float('Quantity', digits=(16,2)),
-        'tender_id' : fields.many2one('purchase.tender','Purchase Tender', ondelete='cascade'),
+        'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
+        'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade')
     }
 
     def onchange_product_id(self, cr, uid, ids, product_id, context={}):
@@ -105,23 +110,26 @@ class purchase_tender_line(osv.osv):
     _defaults = {    
                  'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
                  }
-purchase_tender_line()
+
+purchase_requisition_line()
+
 
 class purchase_order(osv.osv):
     _inherit = "purchase.order"
     _description = "purchase order"
     _columns = {
-        'tender_id' : fields.many2one('purchase.tender','Purchase Tender')
+        'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition')
     }
     def wkf_confirm_order(self, cr, uid, ids, context={}):
         res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context)
         for po in self.browse(cr, uid, ids, context):
-            if po.tender_id and po.tender_id.exclusive:
-                for order in po.tender_id.purchase_ids:
+            if po.requisition_id and (po.requisition_id.exclusive=='exclusive'):
+                for order in po.requisition_id.purchase_ids:
                     if order.id<>po.id:
                         wf_service = netsvc.LocalService("workflow")
                         wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
-                    self.pool.get('purchase.tender').write(cr, uid, [po.tender_id.id], {'state':'close','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
+                    self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'close','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
+
         return res
     
     
@@ -131,10 +139,10 @@ purchase_order()
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
-        'purchase_tender': fields.boolean('Purchase Tender', help="Check this box so that requisitions generates purchase tenders instead of directly requests for quotations.")
+        'purchase_requisition': fields.boolean('Purchase Requisition', help="Check this box so that requisitions generates purchase requisitions instead of directly requests for quotations.")
     }
     _defaults = {
-        'purchase_tender': lambda *args: False
+        'purchase_requisition': lambda *args: False
     }
 product_product()
 
@@ -146,9 +154,11 @@ class mrp_procurement(osv.osv):
         res = super(mrp_procurement, self).make_po(cr, uid, ids, context)
         for proc_id,po_id in res.items():
             procurement = self.browse(cr, uid, proc_id)
-            if procurement.product_id.purchase_tender:
-                self.pool.get('purchase.tender').create(cr, uid, {
-                    'name': sequence_obj.get(cr, uid, 'purchase.order.tender'),
+            if procurement.product_id.purchase_requisition:
+                self.pool.get('purchase.requisition').create(cr, uid, {
+                    'name': procurement.name,
+                    'origin': procurement.name,
+                    'date_end': procurement.date_planned,
                     'lines_ids': [(0,0,{
                         'product_id': procurement.product_id.id,
                         'product_uom_id': procurement.product_uom.id,
@@ -157,4 +167,5 @@ class mrp_procurement(osv.osv):
                     })],
                     'purchase_ids': [(6,0,[po_id])]
                 })
+        return res
 mrp_procurement()
diff --git a/addons/purchase_requisition/purchase_requisition_sequence.xml b/addons/purchase_requisition/purchase_requisition_sequence.xml
new file mode 100644
index 00000000000..c0b08ec11d4
--- /dev/null
+++ b/addons/purchase_requisition/purchase_requisition_sequence.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Sequences for purchase.order --> 
+        <record id="seq_type_purchase_requisition" model="ir.sequence.type">
+            <field name="name">Purchase Requisition Order</field>
+            <field name="code">purchase.order.requisition</field>
+        </record>
+        <record id="seq_purchase_requisition" model="ir.sequence">
+            <field name="name">Purchase Requisition Order</field>
+            <field name="code">purchase.order.requisition</field>
+            <field name="prefix">TE</field>
+            <field name="padding">5</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/purchase_tender/purchase_tender_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
similarity index 67%
rename from addons/purchase_tender/purchase_tender_view.xml
rename to addons/purchase_requisition/purchase_requisition_view.xml
index 281c2751961..f5165eaa394 100644
--- a/addons/purchase_tender/purchase_tender_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -9,7 +9,7 @@
         <field name="inherit_id" ref="purchase.purchase_order_tree"/>
         <field name="arch" type="xml">
             <field name="name" position="after">
-                <field name="tender_id"/>
+                <field name="requisition_id" groups="base.group_extended"/>
             </field>
         </field>
     </record>
@@ -21,23 +21,27 @@
         <field name="inherit_id" ref="purchase.purchase_order_form"/>
         <field name="arch" type="xml">
             <field name="partner_ref" position="after">
-                <field name="tender_id"/>
+                <field name="requisition_id" groups="base.group_extended"/>
             </field>
         </field>
     </record>
 
-    <record model="ir.ui.view" id="view_purchase_tender_form">
-        <field name="name">purchase.tender.form</field>
+    <record model="ir.ui.view" id="view_purchase_requisition_form">
+        <field name="name">purchase.requisition.form</field>
         <field name="type">form</field>
-        <field name="model">purchase.tender</field>
+        <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <form string="Purchase Tender">
-                <field name="name" select="1"/>
-                <field name="user_id" select="1"/>
-                <field name="date_start"/>
-                <field name="date_end"/>
-                <field name="exclusive"/>
-                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+            <form string="Purchase Requisition">
+                <group colspan="4" col="6">
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="exclusive" select="1"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <field name="origin"/>
+					<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>                    
+                </group>
+
                 <notebook colspan="4">
                     <page string="Products">
                         <field name="line_ids" colspan="4" nolabel="1">
@@ -60,7 +64,7 @@
                     </page>
                     <page string="Quotations">
                      	<group col="8" colspan="4">
-                    	<button name="%(action_purchase_tender_partner)d" string="New RfQr" type="action" />
+                    	<button name="%(action_purchase_requisition_partner)d" string="New RfQr" type="action" />
                     	 <label colspan="6"  string=""/>
                     	  </group>
                     	<field name="purchase_ids" nolabel="1" colspan="4"/>
@@ -69,10 +73,10 @@
 				<separator colspan="4"/>
 	                <group col="8" colspan="4">
 	                    <field name="state" select="1" readonly ="1"/>
-						<button name="tender_close" states="open,draft,in_progress" string="Close" type="object" icon="gtk-close" />
+						<button name="tender_close" states="open,draft" string="Close" type="object" icon="gtk-close" />
 	                    <button name="tender_open" states="draft,in_progress" string="Open" type="object" icon="gtk-go-forward" />
-	                    <button name="tender_cancel" states="draft,open,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-	                    <button name="tender_confirm" states="open,in_progress" string="Confirm" type="object" icon="gtk-go-up" />
+	                    <button name="tender_cancel" states="draft,open," string="Cancel" type="object" icon="gtk-cancel" />
+	                    <button name="tender_confirm" states="open" string="Confirm" type="object" icon="gtk-go-up" />
 	                    <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
 	                </group>
 
@@ -80,34 +84,38 @@
             </form>
         </field>
     </record>
-    <record model="ir.ui.view" id="view_purchase_tender_tree">
-        <field name="name">purchase.tender.tree</field>
+    <record model="ir.ui.view" id="view_purchase_requisition_tree">
+        <field name="name">purchase.requisition.tree</field>
         <field name="type">tree</field>
+        <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree string="Purchase Tender">
+            <tree string="Purchase Requisition">
                 <field name="name"/>
                 <field name="user_id"/>
                 <field name="date_start"/>
                 <field name="date_end"/>
+                <field name="origin"/>
                 <field name="state"/>
             </tree>
         </field>
     </record>
-	<record id="view_purchase_tender_filter" model="ir.ui.view">
-            <field name="name">purchase.tender.list.select</field>
-            <field name="model">purchase.tender</field>
+
+	<record id="view_purchase_requisition_filter" model="ir.ui.view">
+            <field name="name">purchase.requisition.list.select</field>
+            <field name="model">purchase.requisition</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Purchase Tender">
+                <search string="Search Purchase Requisition">
                  <group col='10' colspan='4'>
                     <filter icon="terp-purchase" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
-                    <filter icon="terp-purchase" string="Approved" domain="[('state','=','confirmed')]" separator="1"/>
+                    <filter icon="terp-purchase" string="Approved" domain="[('state','=','open')]" separator="1"/>
                     <separator orientation="vertical"/>
-                    <field name="name" select="1" string="Tender Reference"/>
+                    <field name="name" select="1" string="Requisition Reference"/>
                     <field name="purchase_ids" select="1"/>
                     <field name="user_id" select="1" widget="selection">
-                        <filter icon="terp-partner" domain="[('create_uid','=',uid)]" help="My Tender "/>                        
+                        <filter icon="terp-partner" domain="[('create_uid','=',uid)]" help="My Requisition "/>                        
                     </field>
+                    <field name="exclusive" select="1" />
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
@@ -120,16 +128,22 @@
             </field>
         </record>
     
-    <record model="ir.actions.act_window" id="action_purchase_tender">
-        <field name="name">Purchase Tenders</field>
+
+    <record model="ir.actions.act_window" id="action_purchase_requisition">
+        <field name="name">Purchase Requisitions</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">purchase.tender</field>
+        <field name="res_model">purchase.requisition</field>
         <field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>  
-        <field name="search_view_id" ref="view_purchase_tender_filter"/>          
+        <field name="search_view_id" ref="view_purchase_requisition_filter"/>          
     </record>
 
-    <menuitem id="menu_purchase_Tender_pro_mgt" parent="purchase.menu_procurement_management" action="action_purchase_tender"/>
+    <menuitem 
+        id="menu_purchase_requisition_pro_mgt" 
+        sequence="0"
+        groups="base.group_extended"
+        parent="purchase.menu_procurement_management" 
+        action="action_purchase_requisition"/>
 
     <record model="ir.ui.view" id="product_normal_form_view_inherit">
         <field name="name">product.form.inherit</field>
@@ -139,7 +153,7 @@
         <field name="arch" type="xml">
             <field name="supply_method" position="after">
                 <group colspan="2" col="2" attrs="{'invisible': [('supply_method','&lt;&gt;','buy')]}">
-                <field name="purchase_tender"/>
+                <field name="purchase_requisition"/>
                 </group>
             </field>
         </field>
diff --git a/addons/purchase_requisition/security/ir.model.access.csv b/addons/purchase_requisition/security/ir.model.access.csv
new file mode 100644
index 00000000000..8ba518cea7d
--- /dev/null
+++ b/addons/purchase_requisition/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_purchase_requisition","purchase.requisition","model_purchase_requisition","purchase.group_purchase_user",1,1,1,1
+"access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line","purchase.group_purchase_user",1,1,1,1
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
new file mode 100644
index 00000000000..c8318ef01da
--- /dev/null
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+    <record id="group_purchase_requisition_manager" model="res.groups">
+        <field name="name">Purchase Requisition / Manager</field>
+    </record>
+    <record id="group_purchase_requisition_user" model="res.groups">
+        <field name="name">Purchase Requisition / User</field>
+    </record>
+
+
+    <record model="ir.rule.group" id="purchase_requisition_comp_rule_group">
+        <field name="name">Purchase Requisition multi-company</field>
+        <field name="model_id" ref="model_purchase_requisition"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="purchase_requisition_comp_rule">
+        <field name="field_id" search="[('model','=','purchase.requisition'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="purchase_requisition_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+    <record model="ir.rule.group" id="purchase_requisition_line_comp_rule_group">
+        <field name="name">Purchase requisition Line multi-company</field>
+        <field name="model_id" ref="model_purchase_requisition_line"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="purchase_requisition_line_comp_rule">
+        <field name="field_id" search="[('model','=','purchase.requisition.line'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="purchase_requisition_line_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/purchase_tender/wizard/__init__.py b/addons/purchase_requisition/wizard/__init__.py
similarity index 96%
rename from addons/purchase_tender/wizard/__init__.py
rename to addons/purchase_requisition/wizard/__init__.py
index c0e0422b42b..a9691cb6e25 100644
--- a/addons/purchase_tender/wizard/__init__.py
+++ b/addons/purchase_requisition/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import purchase_tender_partner
+import purchase_requisition_partner
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase_tender/wizard/purchase_tender_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
similarity index 75%
rename from addons/purchase_tender/wizard/purchase_tender_partner.py
rename to addons/purchase_requisition/wizard/purchase_requisition_partner.py
index da656def85a..b0ba9d0b41d 100644
--- a/addons/purchase_tender/wizard/purchase_tender_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -27,14 +27,28 @@ import time
 from mx import DateTime
 from osv.orm import browse_record, browse_null
 
-class purchase_tender_partner(osv.osv_memory):
-    _name = "purchase.tender.partner"
-    _description = "Purchase Tender Partner"
+class purchase_requisition_partner(osv.osv_memory):
+    _name = "purchase.requisition.partner"
+    _description = "Purchase Requisition Partner"
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True),
     }
 
+        
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(purchase_requisition_partner, self).view_init(cr, uid, fields_list, context=context)
+        record_id = context and context.get('active_id', False) or False        
+        tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id)
+        if not tender.line_ids:
+                raise osv.except_osv('Error!','No Product in Tender')
+        True
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id):
+        addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['default'])
+        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        return {'value':{'partner_address_id': addr['default']}}
+        
     def create_order(self, cr, uid, ids, context):
         """ 
              To Create a purchase orders .
@@ -54,26 +68,29 @@ class purchase_tender_partner(osv.osv_memory):
             order_obj = self.pool.get('purchase.order')
             order_line_obj = self.pool.get('purchase.order.line')
             partner_obj = self.pool.get('res.partner')
-            tender_line_obj = self.pool.get('purchase.tender.line')
+            tender_line_obj = self.pool.get('purchase.requisition.line')
             pricelist_obj = self.pool.get('product.pricelist')
             prod_obj = self.pool.get('product.product')
-            tender_obj = self.pool.get('purchase.tender')
+            tender_obj = self.pool.get('purchase.requisition')
             acc_pos_obj = self.pool.get('account.fiscal.position')            
             partner_id = data[0]['partner_id']
+            
+            supplier_data = partner_obj.browse(cr, uid,[ partner_id])[0]
+
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             list_line=[]
             purchase_order_line={}
             for tender in tender_obj.browse(cr, uid, record_ids):
                 for line in tender.line_ids:                
                     
-                    uom_id = line.product_id.uom_po_id.id            
+                    uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False            
                     newdate = DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
                     newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
-                    newdate = newdate - line.product_id.seller_ids[0].delay
-        
+                    newdate = newdate -(line.product_id.seller_ids and line.product_id.seller_ids[0].delay or DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
+                    
 
-                    partner = line.product_id.seller_ids[0].name   
-                    pricelist_id = partner.property_product_pricelist_purchase.id             
+                    partner = line.product_id.seller_ids and line.product_id.seller_ids[0].name or supplier_data
+                    pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id 
                     price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
                     product = prod_obj.browse(cr, uid, line.product_id.id, context=context)
         
@@ -101,7 +118,7 @@ class purchase_tender_partner(osv.osv_memory):
                             'location_id': line.product_id.product_tmpl_id.property_stock_production.id,                            
                             'company_id': tender.company_id.id,
                             'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
-                            'tender_id':tender.id,
+                            'requisition_id':tender.id,
                         })
                 order_ids=[]
                 for order_line in list_line:
@@ -111,5 +128,5 @@ class purchase_tender_partner(osv.osv_memory):
                     order_line_obj.create(cr,uid,order_line)
         return {}        
 
-purchase_tender_partner()
+purchase_requisition_partner()
 
diff --git a/addons/purchase_tender/wizard/purchase_tender_partner.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
similarity index 58%
rename from addons/purchase_tender/wizard/purchase_tender_partner.xml
rename to addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index 3820992163e..abac95bba16 100644
--- a/addons/purchase_tender/wizard/purchase_tender_partner.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -1,13 +1,13 @@
 <openerp>
       <data>
 
-    	<record id="view_purchase_tender_partner" model="ir.ui.view">
-            <field name="name">Purchase Tender</field>
-            <field name="model">purchase.tender.partner</field>
+    	<record id="view_purchase_requisition_partner" model="ir.ui.view">
+            <field name="name">Purchase Requisition</field>
+            <field name="model">purchase.requisition.partner</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              	<form string="Purchase Tender">
-              		 <field name="partner_id"/>
+              	<form string="Purchase Requisition">
+              		 <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
               		 <field domain="[('partner_id','=',partner_id)]" name="partner_address_id"/>
 		              <group colspan="4" col="6">
 		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
@@ -17,10 +17,10 @@
             </field>
 		</record>
 
-		<record id="action_purchase_tender_partner" model="ir.actions.act_window">
-	           <field name="name">Purchase Tender</field>
+		<record id="action_purchase_requisition_partner" model="ir.actions.act_window">
+	           <field name="name">Purchase Requisition</field>
 	           <field name="type">ir.actions.act_window</field>
-	           <field name="res_model">purchase.tender.partner</field>
+	           <field name="res_model">purchase.requisition.partner</field>
 	           <field name="view_type">form</field>
 	           <field name="view_mode">form</field>
 		       <field name="context">{'record_id' : active_id}</field>
diff --git a/addons/purchase_tender/i18n/fr_BE.po b/addons/purchase_tender/i18n/fr_BE.po
deleted file mode 100644
index 5b9c10ca2cb..00000000000
--- a/addons/purchase_tender/i18n/fr_BE.po
+++ /dev/null
@@ -1,134 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* purchase_tender
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-25 14:07:40+0000\n"
-"PO-Revision-Date: 2009-11-25 14:07:40+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: purchase_tender
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML incorrect pour l'Architecture des Vues!"
-
-#. module: purchase_tender
-#: field:purchase.tender,date_end:0
-msgid "Date End"
-msgstr "Date de fin"
-
-#. module: purchase_tender
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'Objet doit commencer par x_ et ne pas comporter de caractères spéciaux !"
-
-#. module: purchase_tender
-#: view:purchase.tender:0
-#: field:purchase.tender,description:0
-msgid "Description"
-msgstr "Description"
-
-#. module: purchase_tender
-#: model:ir.model,name:purchase_tender.model_purchase_tender
-#: field:purchase.order,tender_id:0
-#: view:purchase.tender:0
-msgid "Purchase Tender"
-msgstr "Appel d'Offre"
-
-#. module: purchase_tender
-#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender
-#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1
-#: model:ir.ui.menu,name:purchase_tender.menu_purchase_tender
-msgid "Purchase Tenders"
-msgstr "Appels d'offre"
-
-#. module: purchase_tender
-#: selection:purchase.tender,state:0
-msgid "Open"
-msgstr "Ouvert"
-
-#. module: purchase_tender
-#: field:purchase.tender,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: purchase_tender
-#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_draft
-#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_draft
-msgid "Draft Purchase Tenders"
-msgstr "Appels d'Offre brouillons"
-
-#. module: purchase_tender
-#: field:purchase.tender,state:0
-msgid "State"
-msgstr "Etat"
-
-#. module: purchase_tender
-#: selection:purchase.tender,state:0
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: purchase_tender
-#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_open
-#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_open
-msgid "Open Purchase Tenders"
-msgstr "Appels d'offre ouverts"
-
-#. module: purchase_tender
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de modèle incorrect pour la définition de l'action"
-
-#. module: purchase_tender
-#: model:ir.module.module,shortdesc:purchase_tender.module_meta_information
-msgid "Purchase - Purchase Tender"
-msgstr "Achat - Appel d'offre"
-
-#. module: purchase_tender
-#: field:purchase.tender,name:0
-msgid "Tender Reference"
-msgstr "Référence"
-
-#. module: purchase_tender
-#: selection:purchase.tender,state:0
-msgid "Close"
-msgstr "Clôturé"
-
-#. module: purchase_tender
-#: field:purchase.tender,date_start:0
-msgid "Date Start"
-msgstr "Date de début"
-
-#. module: purchase_tender
-#: view:purchase.tender:0
-msgid "Quotations"
-msgstr ""
-
-#. module: purchase_tender
-#: model:ir.module.module,description:purchase_tender.module_meta_information
-msgid " This module allows you to manage your Purchase Tenders. When a purchase order is created, you now have the opportunity to save the related tender. \n"
-"    This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
-""
-msgstr "Ce module vous permet de gérer des appels d'offre. Quand un appel d'offre est créé, vous avez maintenant l'opportunité de conserver une trace. \n"
-"    Ce nouvel objet regroupe et conserve la trace de tous vos appels d'offre.\n"
-""
-
-#. module: purchase_tender
-#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_new
-#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_new
-msgid "New Purchase Tenders"
-msgstr "Nouveaux Appels d'Offre"
-
-#. module: purchase_tender
-#: field:purchase.tender,purchase_ids:0
-msgid "Purchase Orders"
-msgstr "Bons d'achat"
-
diff --git a/addons/purchase_tender/purchase_tender_sequence.xml b/addons/purchase_tender/purchase_tender_sequence.xml
deleted file mode 100644
index 222e3f46282..00000000000
--- a/addons/purchase_tender/purchase_tender_sequence.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <!-- Sequences for purchase.order --> 
-        <record id="seq_type_purchase_tender_order" model="ir.sequence.type">
-            <field name="name">Purchase Tender Order</field>
-            <field name="code">purchase.order.tender</field>
-        </record>
-        <record id="seq_purchase_tender_order" model="ir.sequence">
-            <field name="name">Purchase Tender Order</field>
-            <field name="code">purchase.order.tender</field>
-            <field name="prefix">TE</field>
-            <field name="padding">5</field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/purchase_tender/security/ir.model.access.csv b/addons/purchase_tender/security/ir.model.access.csv
deleted file mode 100644
index 17698819d17..00000000000
--- a/addons/purchase_tender/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_purchase_tender_manager","purchase.tender","model_purchase_tender","group_purchase_tender_manager",1,1,1,1
-"access_purchase_tender_user","purchase.tender","model_purchase_tender","group_purchase_tender_user",1,0,0,0
diff --git a/addons/purchase_tender/security/purchase_tender.xml b/addons/purchase_tender/security/purchase_tender.xml
deleted file mode 100644
index 44af4bf7af4..00000000000
--- a/addons/purchase_tender/security/purchase_tender.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="1">
-
-    <record id="group_purchase_tender_manager" model="res.groups">
-        <field name="name">Purchase Tender / Manager</field>
-    </record>
-    <record id="group_purchase_tender_user" model="res.groups">
-        <field name="name">Purchase Tender / User</field>
-    </record>
-
-
-    <record model="ir.rule.group" id="purchase_tender_comp_rule_group">
-        <field name="name">Purchase Tender multi-company</field>
-        <field name="model_id" ref="model_purchase_tender"/>
-        <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="purchase_tender_comp_rule">
-        <field name="field_id" search="[('model','=','purchase.tender'),('name','=','company_id')]" model="ir.model.fields"/>
-        <field name="rule_group" ref="purchase_tender_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <record model="ir.rule.group" id="purchase_tender_line_comp_rule_group">
-        <field name="name">Purchase Tender Line multi-company</field>
-        <field name="model_id" ref="model_purchase_tender_line"/>
-        <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="purchase_tender_line_comp_rule">
-        <field name="field_id" search="[('model','=','purchase.tender.line'),('name','=','company_id')]" model="ir.model.fields"/>
-        <field name="rule_group" ref="purchase_tender_line_comp_rule_group"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/report_account/i18n/ar.po b/addons/report_account/i18n/ar.po
index db3d4c3cee2..a0a70950006 100644
--- a/addons/report_account/i18n/ar.po
+++ b/addons/report_account/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/bg.po b/addons/report_account/i18n/bg.po
index 2d956531547..2f6b6ecf970 100644
--- a/addons/report_account/i18n/bg.po
+++ b/addons/report_account/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/bs.po b/addons/report_account/i18n/bs.po
index c6d6ccc6ff8..08ba846cf8a 100644
--- a/addons/report_account/i18n/bs.po
+++ b/addons/report_account/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/ca.po b/addons/report_account/i18n/ca.po
index 970cf828c40..f3e1a600d23 100644
--- a/addons/report_account/i18n/ca.po
+++ b/addons/report_account/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/cs.po b/addons/report_account/i18n/cs.po
index db3d4c3cee2..a0a70950006 100644
--- a/addons/report_account/i18n/cs.po
+++ b/addons/report_account/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/de.po b/addons/report_account/i18n/de.po
index c5a6597e45b..b3c41cba5ec 100644
--- a/addons/report_account/i18n/de.po
+++ b/addons/report_account/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/el.po b/addons/report_account/i18n/el.po
index 4134a1ea750..68bc0ab4597 100644
--- a/addons/report_account/i18n/el.po
+++ b/addons/report_account/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/es.po b/addons/report_account/i18n/es.po
index 6d105c54717..83235bbf61f 100644
--- a/addons/report_account/i18n/es.po
+++ b/addons/report_account/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/es_AR.po b/addons/report_account/i18n/es_AR.po
index 74cc8cda3ec..44bbc886433 100644
--- a/addons/report_account/i18n/es_AR.po
+++ b/addons/report_account/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/et.po b/addons/report_account/i18n/et.po
index 7014e2acafd..d49ea3a3c4e 100644
--- a/addons/report_account/i18n/et.po
+++ b/addons/report_account/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/fr.po b/addons/report_account/i18n/fr.po
index 65310a4c1d4..ce2b413c641 100644
--- a/addons/report_account/i18n/fr.po
+++ b/addons/report_account/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/gl.po b/addons/report_account/i18n/gl.po
index 62d34cef2b5..6dc99eef40a 100644
--- a/addons/report_account/i18n/gl.po
+++ b/addons/report_account/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/hr.po b/addons/report_account/i18n/hr.po
index ee3e9acccfe..27ea37fd939 100644
--- a/addons/report_account/i18n/hr.po
+++ b/addons/report_account/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_account/i18n/hu.po b/addons/report_account/i18n/hu.po
index db3d4c3cee2..a0a70950006 100644
--- a/addons/report_account/i18n/hu.po
+++ b/addons/report_account/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/id.po b/addons/report_account/i18n/id.po
index f72bc8a333c..8add0e92b97 100644
--- a/addons/report_account/i18n/id.po
+++ b/addons/report_account/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/it.po b/addons/report_account/i18n/it.po
index ac45aaadabc..b43a61f145e 100644
--- a/addons/report_account/i18n/it.po
+++ b/addons/report_account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/ko.po b/addons/report_account/i18n/ko.po
index bb58c38370a..fb7e4b7c6f8 100644
--- a/addons/report_account/i18n/ko.po
+++ b/addons/report_account/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/lt.po b/addons/report_account/i18n/lt.po
index db3d4c3cee2..a0a70950006 100644
--- a/addons/report_account/i18n/lt.po
+++ b/addons/report_account/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/nl.po b/addons/report_account/i18n/nl.po
index b2ec071ae65..776daaf62d5 100644
--- a/addons/report_account/i18n/nl.po
+++ b/addons/report_account/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/pl.po b/addons/report_account/i18n/pl.po
index b9ab015612c..3b18b84bbf8 100644
--- a/addons/report_account/i18n/pl.po
+++ b/addons/report_account/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/pt.po b/addons/report_account/i18n/pt.po
index fe5f3e7c99f..682efd46ea6 100644
--- a/addons/report_account/i18n/pt.po
+++ b/addons/report_account/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/pt_BR.po b/addons/report_account/i18n/pt_BR.po
index e2f77bef73e..f5d0c15dd97 100644
--- a/addons/report_account/i18n/pt_BR.po
+++ b/addons/report_account/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/ro.po b/addons/report_account/i18n/ro.po
index 87615236a77..ed97d527a57 100644
--- a/addons/report_account/i18n/ro.po
+++ b/addons/report_account/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/ru.po b/addons/report_account/i18n/ru.po
index aad60e4e8fd..46d4eda8c58 100644
--- a/addons/report_account/i18n/ru.po
+++ b/addons/report_account/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/sl.po b/addons/report_account/i18n/sl.po
index ba0856d21a4..3f30e5bdf7f 100644
--- a/addons/report_account/i18n/sl.po
+++ b/addons/report_account/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/sv.po b/addons/report_account/i18n/sv.po
index 6739e5f83b8..061ccebe3a6 100644
--- a/addons/report_account/i18n/sv.po
+++ b/addons/report_account/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/tlh.po b/addons/report_account/i18n/tlh.po
index 4312043c2b9..071d1fb43ef 100644
--- a/addons/report_account/i18n/tlh.po
+++ b/addons/report_account/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/tr.po b/addons/report_account/i18n/tr.po
index 51bb88f1d17..f2767522559 100644
--- a/addons/report_account/i18n/tr.po
+++ b/addons/report_account/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/uk.po b/addons/report_account/i18n/uk.po
index 6be03fa0c97..0c30c5f8a0e 100644
--- a/addons/report_account/i18n/uk.po
+++ b/addons/report_account/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/zh_CN.po b/addons/report_account/i18n/zh_CN.po
index 0882a6257bd..0d9b5429a2e 100644
--- a/addons/report_account/i18n/zh_CN.po
+++ b/addons/report_account/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_account/i18n/zh_TW.po b/addons/report_account/i18n/zh_TW.po
index 014de8ae7b1..9f606456d1a 100644
--- a/addons/report_account/i18n/zh_TW.po
+++ b/addons/report_account/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
diff --git a/addons/report_analytic/i18n/ar.po b/addons/report_analytic/i18n/ar.po
index ad24d4d5a52..b0384cb4d4c 100644
--- a/addons/report_analytic/i18n/ar.po
+++ b/addons/report_analytic/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/bg.po b/addons/report_analytic/i18n/bg.po
index 6e424ffbe3d..392dc88bbf2 100644
--- a/addons/report_analytic/i18n/bg.po
+++ b/addons/report_analytic/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/bs.po b/addons/report_analytic/i18n/bs.po
index 081c88c594d..355e1d23ff5 100644
--- a/addons/report_analytic/i18n/bs.po
+++ b/addons/report_analytic/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/ca.po b/addons/report_analytic/i18n/ca.po
index ac0bd3d925b..183b95b4b04 100644
--- a/addons/report_analytic/i18n/ca.po
+++ b/addons/report_analytic/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/cs.po b/addons/report_analytic/i18n/cs.po
index ad24d4d5a52..b0384cb4d4c 100644
--- a/addons/report_analytic/i18n/cs.po
+++ b/addons/report_analytic/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/da.po b/addons/report_analytic/i18n/da.po
index 4d5fdec1a5d..ef5756f26d7 100644
--- a/addons/report_analytic/i18n/da.po
+++ b/addons/report_analytic/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/de.po b/addons/report_analytic/i18n/de.po
index 3dc328b4c45..af0be924bf4 100644
--- a/addons/report_analytic/i18n/de.po
+++ b/addons/report_analytic/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/el.po b/addons/report_analytic/i18n/el.po
index c0309105af5..08c0afaf870 100644
--- a/addons/report_analytic/i18n/el.po
+++ b/addons/report_analytic/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/es.po b/addons/report_analytic/i18n/es.po
index c5a24770061..1142f4e7389 100644
--- a/addons/report_analytic/i18n/es.po
+++ b/addons/report_analytic/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/es_AR.po b/addons/report_analytic/i18n/es_AR.po
index fb371bb6c96..7dd6a7a652f 100644
--- a/addons/report_analytic/i18n/es_AR.po
+++ b/addons/report_analytic/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/et.po b/addons/report_analytic/i18n/et.po
index c8e772ad59a..d3e15c530ee 100644
--- a/addons/report_analytic/i18n/et.po
+++ b/addons/report_analytic/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/fr.po b/addons/report_analytic/i18n/fr.po
index 48baebf3b1a..0583a156ec4 100644
--- a/addons/report_analytic/i18n/fr.po
+++ b/addons/report_analytic/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/gl.po b/addons/report_analytic/i18n/gl.po
index 0f16cd7be2c..4974ec7cae2 100644
--- a/addons/report_analytic/i18n/gl.po
+++ b/addons/report_analytic/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/hr.po b/addons/report_analytic/i18n/hr.po
index ad5efd1bb81..4a2873d8fad 100644
--- a/addons/report_analytic/i18n/hr.po
+++ b/addons/report_analytic/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_analytic/i18n/hu.po b/addons/report_analytic/i18n/hu.po
index ad24d4d5a52..b0384cb4d4c 100644
--- a/addons/report_analytic/i18n/hu.po
+++ b/addons/report_analytic/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/id.po b/addons/report_analytic/i18n/id.po
index c3ece6b872d..40940c22205 100644
--- a/addons/report_analytic/i18n/id.po
+++ b/addons/report_analytic/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/it.po b/addons/report_analytic/i18n/it.po
index 9c08c4bce24..fd65e9fbe92 100644
--- a/addons/report_analytic/i18n/it.po
+++ b/addons/report_analytic/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/ko.po b/addons/report_analytic/i18n/ko.po
index 89da4b83139..436b468a6a0 100644
--- a/addons/report_analytic/i18n/ko.po
+++ b/addons/report_analytic/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/lt.po b/addons/report_analytic/i18n/lt.po
index ad24d4d5a52..b0384cb4d4c 100644
--- a/addons/report_analytic/i18n/lt.po
+++ b/addons/report_analytic/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/nl.po b/addons/report_analytic/i18n/nl.po
index faddf864b76..4c5d71c563b 100644
--- a/addons/report_analytic/i18n/nl.po
+++ b/addons/report_analytic/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/nl_BE.po b/addons/report_analytic/i18n/nl_BE.po
index b3e49d51814..ab77996a858 100644
--- a/addons/report_analytic/i18n/nl_BE.po
+++ b/addons/report_analytic/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/pl.po b/addons/report_analytic/i18n/pl.po
index 4714910b624..906dafc61c1 100644
--- a/addons/report_analytic/i18n/pl.po
+++ b/addons/report_analytic/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/pt.po b/addons/report_analytic/i18n/pt.po
index 5833a2821e0..a33b1a5607f 100644
--- a/addons/report_analytic/i18n/pt.po
+++ b/addons/report_analytic/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/pt_BR.po b/addons/report_analytic/i18n/pt_BR.po
index 7a33af77653..1b243cffba2 100644
--- a/addons/report_analytic/i18n/pt_BR.po
+++ b/addons/report_analytic/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/ro.po b/addons/report_analytic/i18n/ro.po
index ad24d4d5a52..b0384cb4d4c 100644
--- a/addons/report_analytic/i18n/ro.po
+++ b/addons/report_analytic/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/ru.po b/addons/report_analytic/i18n/ru.po
index bba8d3fa3a6..1866f5751fc 100644
--- a/addons/report_analytic/i18n/ru.po
+++ b/addons/report_analytic/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/sl.po b/addons/report_analytic/i18n/sl.po
index ffd4ae8b00b..8dd95c0e03b 100644
--- a/addons/report_analytic/i18n/sl.po
+++ b/addons/report_analytic/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/sv.po b/addons/report_analytic/i18n/sv.po
index 14ce414f472..eecc7b379c1 100644
--- a/addons/report_analytic/i18n/sv.po
+++ b/addons/report_analytic/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/tlh.po b/addons/report_analytic/i18n/tlh.po
index f362c85aaca..33180bad659 100644
--- a/addons/report_analytic/i18n/tlh.po
+++ b/addons/report_analytic/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/tr.po b/addons/report_analytic/i18n/tr.po
index 59bd3ebe515..d9ef28a3e53 100644
--- a/addons/report_analytic/i18n/tr.po
+++ b/addons/report_analytic/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/uk.po b/addons/report_analytic/i18n/uk.po
index 85492d7eafb..5d2e14387c1 100644
--- a/addons/report_analytic/i18n/uk.po
+++ b/addons/report_analytic/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/zh_CN.po b/addons/report_analytic/i18n/zh_CN.po
index 9e87c49c69a..a053b2ae4b1 100644
--- a/addons/report_analytic/i18n/zh_CN.po
+++ b/addons/report_analytic/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic/i18n/zh_TW.po b/addons/report_analytic/i18n/zh_TW.po
index 20138d7480c..9967b9ec0e4 100644
--- a/addons/report_analytic/i18n/zh_TW.po
+++ b/addons/report_analytic/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
diff --git a/addons/report_analytic_line/i18n/ar.po b/addons/report_analytic_line/i18n/ar.po
index 41f682cd7f9..3da5cf8488b 100644
--- a/addons/report_analytic_line/i18n/ar.po
+++ b/addons/report_analytic_line/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/bg.po b/addons/report_analytic_line/i18n/bg.po
index 7ec5a596b26..00355240b3b 100644
--- a/addons/report_analytic_line/i18n/bg.po
+++ b/addons/report_analytic_line/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/bs.po b/addons/report_analytic_line/i18n/bs.po
index 686787d0735..b5c499cd662 100644
--- a/addons/report_analytic_line/i18n/bs.po
+++ b/addons/report_analytic_line/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/ca.po b/addons/report_analytic_line/i18n/ca.po
index 6d2c859d86b..51b72bc7012 100644
--- a/addons/report_analytic_line/i18n/ca.po
+++ b/addons/report_analytic_line/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/cs.po b/addons/report_analytic_line/i18n/cs.po
index 41f682cd7f9..3da5cf8488b 100644
--- a/addons/report_analytic_line/i18n/cs.po
+++ b/addons/report_analytic_line/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/de.po b/addons/report_analytic_line/i18n/de.po
index e2b1ec086ff..0894845f3a2 100644
--- a/addons/report_analytic_line/i18n/de.po
+++ b/addons/report_analytic_line/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/el.po b/addons/report_analytic_line/i18n/el.po
index 75d496bccc0..b5078fd50b2 100644
--- a/addons/report_analytic_line/i18n/el.po
+++ b/addons/report_analytic_line/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/es.po b/addons/report_analytic_line/i18n/es.po
index 77ca04afb27..64fc8a87cca 100644
--- a/addons/report_analytic_line/i18n/es.po
+++ b/addons/report_analytic_line/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/es_AR.po b/addons/report_analytic_line/i18n/es_AR.po
index 5dc162ddd33..5ca8181da0a 100644
--- a/addons/report_analytic_line/i18n/es_AR.po
+++ b/addons/report_analytic_line/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/et.po b/addons/report_analytic_line/i18n/et.po
index 35490187cd0..0ab294e4903 100644
--- a/addons/report_analytic_line/i18n/et.po
+++ b/addons/report_analytic_line/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/fr.po b/addons/report_analytic_line/i18n/fr.po
index 526ece3aa87..7fa878f8d7e 100644
--- a/addons/report_analytic_line/i18n/fr.po
+++ b/addons/report_analytic_line/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/gl.po b/addons/report_analytic_line/i18n/gl.po
index 49732f186ef..19adf2b0f3a 100644
--- a/addons/report_analytic_line/i18n/gl.po
+++ b/addons/report_analytic_line/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/hr.po b/addons/report_analytic_line/i18n/hr.po
index b8bbb439b4a..50dd1e4b397 100644
--- a/addons/report_analytic_line/i18n/hr.po
+++ b/addons/report_analytic_line/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_analytic_line/i18n/hu.po b/addons/report_analytic_line/i18n/hu.po
index 41f682cd7f9..3da5cf8488b 100644
--- a/addons/report_analytic_line/i18n/hu.po
+++ b/addons/report_analytic_line/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/id.po b/addons/report_analytic_line/i18n/id.po
index 1f3170dd434..847d51e279a 100644
--- a/addons/report_analytic_line/i18n/id.po
+++ b/addons/report_analytic_line/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/it.po b/addons/report_analytic_line/i18n/it.po
index f7bef480936..6663b9f90f0 100644
--- a/addons/report_analytic_line/i18n/it.po
+++ b/addons/report_analytic_line/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/ko.po b/addons/report_analytic_line/i18n/ko.po
index dd6925d82cd..600a6f99f1c 100644
--- a/addons/report_analytic_line/i18n/ko.po
+++ b/addons/report_analytic_line/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/lt.po b/addons/report_analytic_line/i18n/lt.po
index 41f682cd7f9..3da5cf8488b 100644
--- a/addons/report_analytic_line/i18n/lt.po
+++ b/addons/report_analytic_line/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/nl.po b/addons/report_analytic_line/i18n/nl.po
index 2f6cd91500d..a17148c6324 100644
--- a/addons/report_analytic_line/i18n/nl.po
+++ b/addons/report_analytic_line/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/nl_BE.po b/addons/report_analytic_line/i18n/nl_BE.po
index b7dab54fd95..8b1b8324883 100644
--- a/addons/report_analytic_line/i18n/nl_BE.po
+++ b/addons/report_analytic_line/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/pl.po b/addons/report_analytic_line/i18n/pl.po
index 593de6b1258..5fd59d8e4bd 100644
--- a/addons/report_analytic_line/i18n/pl.po
+++ b/addons/report_analytic_line/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/pt.po b/addons/report_analytic_line/i18n/pt.po
index 2ddec6eca42..90217de1840 100644
--- a/addons/report_analytic_line/i18n/pt.po
+++ b/addons/report_analytic_line/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/pt_BR.po b/addons/report_analytic_line/i18n/pt_BR.po
index 204be544d62..a09108fe606 100644
--- a/addons/report_analytic_line/i18n/pt_BR.po
+++ b/addons/report_analytic_line/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/ro.po b/addons/report_analytic_line/i18n/ro.po
index 41f682cd7f9..3da5cf8488b 100644
--- a/addons/report_analytic_line/i18n/ro.po
+++ b/addons/report_analytic_line/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/ru.po b/addons/report_analytic_line/i18n/ru.po
index 69eb85adc6b..012d5005ddd 100644
--- a/addons/report_analytic_line/i18n/ru.po
+++ b/addons/report_analytic_line/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/sl.po b/addons/report_analytic_line/i18n/sl.po
index def8024356f..060fcf7001a 100644
--- a/addons/report_analytic_line/i18n/sl.po
+++ b/addons/report_analytic_line/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/sv.po b/addons/report_analytic_line/i18n/sv.po
index 6b6d198902b..bf0288744dc 100644
--- a/addons/report_analytic_line/i18n/sv.po
+++ b/addons/report_analytic_line/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/tlh.po b/addons/report_analytic_line/i18n/tlh.po
index 132559ba6a7..c4fd282fc4c 100644
--- a/addons/report_analytic_line/i18n/tlh.po
+++ b/addons/report_analytic_line/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/tr.po b/addons/report_analytic_line/i18n/tr.po
index d8f0b55c11c..562141de104 100644
--- a/addons/report_analytic_line/i18n/tr.po
+++ b/addons/report_analytic_line/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/uk.po b/addons/report_analytic_line/i18n/uk.po
index 89f1430fa73..b9387254072 100644
--- a/addons/report_analytic_line/i18n/uk.po
+++ b/addons/report_analytic_line/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/zh_CN.po b/addons/report_analytic_line/i18n/zh_CN.po
index dcdcec2540d..6b37f5cba61 100644
--- a/addons/report_analytic_line/i18n/zh_CN.po
+++ b/addons/report_analytic_line/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_line/i18n/zh_TW.po b/addons/report_analytic_line/i18n/zh_TW.po
index 9c0256957f2..32cf5cdf721 100644
--- a/addons/report_analytic_line/i18n/zh_TW.po
+++ b/addons/report_analytic_line/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
diff --git a/addons/report_analytic_planning/i18n/ar.po b/addons/report_analytic_planning/i18n/ar.po
index 9788723315c..b0eea5bf70b 100644
--- a/addons/report_analytic_planning/i18n/ar.po
+++ b/addons/report_analytic_planning/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/bg.po b/addons/report_analytic_planning/i18n/bg.po
index 52b59feb411..41f54dca9c2 100644
--- a/addons/report_analytic_planning/i18n/bg.po
+++ b/addons/report_analytic_planning/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/bs.po b/addons/report_analytic_planning/i18n/bs.po
index 107d06790dd..41cddb05cb6 100644
--- a/addons/report_analytic_planning/i18n/bs.po
+++ b/addons/report_analytic_planning/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/ca.po b/addons/report_analytic_planning/i18n/ca.po
index 06afc2f6a15..b3fda531aea 100644
--- a/addons/report_analytic_planning/i18n/ca.po
+++ b/addons/report_analytic_planning/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/cs.po b/addons/report_analytic_planning/i18n/cs.po
index 4b34ea577ae..b0eea5bf70b 100644
--- a/addons/report_analytic_planning/i18n/cs.po
+++ b/addons/report_analytic_planning/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/de.po b/addons/report_analytic_planning/i18n/de.po
index 98fd50dda91..1f4e23b5827 100644
--- a/addons/report_analytic_planning/i18n/de.po
+++ b/addons/report_analytic_planning/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/el.po b/addons/report_analytic_planning/i18n/el.po
index cb7f463aca0..271b453875d 100644
--- a/addons/report_analytic_planning/i18n/el.po
+++ b/addons/report_analytic_planning/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/es.po b/addons/report_analytic_planning/i18n/es.po
index 511c5a4ee25..25866d15c14 100644
--- a/addons/report_analytic_planning/i18n/es.po
+++ b/addons/report_analytic_planning/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/es_AR.po b/addons/report_analytic_planning/i18n/es_AR.po
index 38d08d9a5cc..a9df2dd8816 100644
--- a/addons/report_analytic_planning/i18n/es_AR.po
+++ b/addons/report_analytic_planning/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/et.po b/addons/report_analytic_planning/i18n/et.po
index dfc8f21368a..1f28764aa4a 100644
--- a/addons/report_analytic_planning/i18n/et.po
+++ b/addons/report_analytic_planning/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/fr.po b/addons/report_analytic_planning/i18n/fr.po
index db32fe2c9f0..c0914a30ca2 100644
--- a/addons/report_analytic_planning/i18n/fr.po
+++ b/addons/report_analytic_planning/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/hr.po b/addons/report_analytic_planning/i18n/hr.po
index 0ad98276f28..2d5dabb1225 100644
--- a/addons/report_analytic_planning/i18n/hr.po
+++ b/addons/report_analytic_planning/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_analytic_planning/i18n/hu.po b/addons/report_analytic_planning/i18n/hu.po
index 4b34ea577ae..b0eea5bf70b 100644
--- a/addons/report_analytic_planning/i18n/hu.po
+++ b/addons/report_analytic_planning/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/id.po b/addons/report_analytic_planning/i18n/id.po
index 564da9a4181..4ffb4d9413e 100644
--- a/addons/report_analytic_planning/i18n/id.po
+++ b/addons/report_analytic_planning/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/it.po b/addons/report_analytic_planning/i18n/it.po
index b28e8f67bd6..338bcd00206 100644
--- a/addons/report_analytic_planning/i18n/it.po
+++ b/addons/report_analytic_planning/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/ko.po b/addons/report_analytic_planning/i18n/ko.po
index b311891c166..a175eca9eb2 100644
--- a/addons/report_analytic_planning/i18n/ko.po
+++ b/addons/report_analytic_planning/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/lt.po b/addons/report_analytic_planning/i18n/lt.po
index 4b34ea577ae..b0eea5bf70b 100644
--- a/addons/report_analytic_planning/i18n/lt.po
+++ b/addons/report_analytic_planning/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/nl.po b/addons/report_analytic_planning/i18n/nl.po
index 1478ef3d1de..b8019be6881 100644
--- a/addons/report_analytic_planning/i18n/nl.po
+++ b/addons/report_analytic_planning/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/nl_BE.po b/addons/report_analytic_planning/i18n/nl_BE.po
index 4e84393a862..e8962b77a2a 100644
--- a/addons/report_analytic_planning/i18n/nl_BE.po
+++ b/addons/report_analytic_planning/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/pl.po b/addons/report_analytic_planning/i18n/pl.po
index 03d5128115c..7d0c65231f5 100644
--- a/addons/report_analytic_planning/i18n/pl.po
+++ b/addons/report_analytic_planning/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/pt.po b/addons/report_analytic_planning/i18n/pt.po
index 2a77819682c..a240d0c28f5 100644
--- a/addons/report_analytic_planning/i18n/pt.po
+++ b/addons/report_analytic_planning/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/pt_BR.po b/addons/report_analytic_planning/i18n/pt_BR.po
index fdf091ea93e..54551f5d14b 100644
--- a/addons/report_analytic_planning/i18n/pt_BR.po
+++ b/addons/report_analytic_planning/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/ro.po b/addons/report_analytic_planning/i18n/ro.po
index 4b34ea577ae..b0eea5bf70b 100644
--- a/addons/report_analytic_planning/i18n/ro.po
+++ b/addons/report_analytic_planning/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/ru.po b/addons/report_analytic_planning/i18n/ru.po
index 13bf0101149..3d8a23185a5 100644
--- a/addons/report_analytic_planning/i18n/ru.po
+++ b/addons/report_analytic_planning/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/sl.po b/addons/report_analytic_planning/i18n/sl.po
index 99e51e72d29..b0b63cdfb89 100644
--- a/addons/report_analytic_planning/i18n/sl.po
+++ b/addons/report_analytic_planning/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/sv.po b/addons/report_analytic_planning/i18n/sv.po
index 2db7e6cd917..7b1cb4c4e20 100644
--- a/addons/report_analytic_planning/i18n/sv.po
+++ b/addons/report_analytic_planning/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/tlh.po b/addons/report_analytic_planning/i18n/tlh.po
index 9d3e5a4f5dd..acaaf9fab3a 100644
--- a/addons/report_analytic_planning/i18n/tlh.po
+++ b/addons/report_analytic_planning/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/tr.po b/addons/report_analytic_planning/i18n/tr.po
index c95607a2f4e..e3cc4f6c13a 100644
--- a/addons/report_analytic_planning/i18n/tr.po
+++ b/addons/report_analytic_planning/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/uk.po b/addons/report_analytic_planning/i18n/uk.po
index a019380cdf5..def11c4ef4c 100644
--- a/addons/report_analytic_planning/i18n/uk.po
+++ b/addons/report_analytic_planning/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/zh_CN.po b/addons/report_analytic_planning/i18n/zh_CN.po
index 2a489fcbf05..8065aa3f1f2 100644
--- a/addons/report_analytic_planning/i18n/zh_CN.po
+++ b/addons/report_analytic_planning/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_analytic_planning/i18n/zh_TW.po b/addons/report_analytic_planning/i18n/zh_TW.po
index b43e7033f04..47035195c5a 100644
--- a/addons/report_analytic_planning/i18n/zh_TW.po
+++ b/addons/report_analytic_planning/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
diff --git a/addons/report_crm/i18n/ar.po b/addons/report_crm/i18n/ar.po
index 808bbc5cca1..0c7edf6e4c6 100644
--- a/addons/report_crm/i18n/ar.po
+++ b/addons/report_crm/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/bg.po b/addons/report_crm/i18n/bg.po
index 77ce7825f8c..ea21db313d5 100644
--- a/addons/report_crm/i18n/bg.po
+++ b/addons/report_crm/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/bs.po b/addons/report_crm/i18n/bs.po
index 91785aa7990..7028d5b8e9d 100644
--- a/addons/report_crm/i18n/bs.po
+++ b/addons/report_crm/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/ca.po b/addons/report_crm/i18n/ca.po
index 9d7f55b78f5..0c5d17c2ae5 100644
--- a/addons/report_crm/i18n/ca.po
+++ b/addons/report_crm/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/cs.po b/addons/report_crm/i18n/cs.po
index 808bbc5cca1..0c7edf6e4c6 100644
--- a/addons/report_crm/i18n/cs.po
+++ b/addons/report_crm/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/de.po b/addons/report_crm/i18n/de.po
index 6c02e2a7f7d..92d454bdb05 100644
--- a/addons/report_crm/i18n/de.po
+++ b/addons/report_crm/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/el.po b/addons/report_crm/i18n/el.po
index b85ab46497e..e4232eb1829 100644
--- a/addons/report_crm/i18n/el.po
+++ b/addons/report_crm/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/es.po b/addons/report_crm/i18n/es.po
index 22972b49162..978710c94f8 100644
--- a/addons/report_crm/i18n/es.po
+++ b/addons/report_crm/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/es_AR.po b/addons/report_crm/i18n/es_AR.po
index 1738e8e2641..55f8d4f27e9 100644
--- a/addons/report_crm/i18n/es_AR.po
+++ b/addons/report_crm/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/et.po b/addons/report_crm/i18n/et.po
index f23a3f5ef18..8795ab3e42f 100644
--- a/addons/report_crm/i18n/et.po
+++ b/addons/report_crm/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/fr.po b/addons/report_crm/i18n/fr.po
index 0dabd82728d..2d823af745e 100644
--- a/addons/report_crm/i18n/fr.po
+++ b/addons/report_crm/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/hr.po b/addons/report_crm/i18n/hr.po
index 4555268d535..590d589ecd4 100644
--- a/addons/report_crm/i18n/hr.po
+++ b/addons/report_crm/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_crm/i18n/hu.po b/addons/report_crm/i18n/hu.po
index 808bbc5cca1..0c7edf6e4c6 100644
--- a/addons/report_crm/i18n/hu.po
+++ b/addons/report_crm/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/id.po b/addons/report_crm/i18n/id.po
index 1f7eb0f448f..93ae0c61ed9 100644
--- a/addons/report_crm/i18n/id.po
+++ b/addons/report_crm/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/it.po b/addons/report_crm/i18n/it.po
index a1f21c678b1..921c506424c 100644
--- a/addons/report_crm/i18n/it.po
+++ b/addons/report_crm/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/ko.po b/addons/report_crm/i18n/ko.po
index ec53932af06..fe3dd0595e9 100644
--- a/addons/report_crm/i18n/ko.po
+++ b/addons/report_crm/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/lt.po b/addons/report_crm/i18n/lt.po
index 5db231f442d..362a6db1d64 100644
--- a/addons/report_crm/i18n/lt.po
+++ b/addons/report_crm/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/nl.po b/addons/report_crm/i18n/nl.po
index c04972f3677..a63642c6495 100644
--- a/addons/report_crm/i18n/nl.po
+++ b/addons/report_crm/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/nl_BE.po b/addons/report_crm/i18n/nl_BE.po
index 03fc15ea371..1467a416a1a 100644
--- a/addons/report_crm/i18n/nl_BE.po
+++ b/addons/report_crm/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/pl.po b/addons/report_crm/i18n/pl.po
index 5e291c294fb..1f231ed6b15 100644
--- a/addons/report_crm/i18n/pl.po
+++ b/addons/report_crm/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/pt.po b/addons/report_crm/i18n/pt.po
index 6642740c2e4..df5f4d5805e 100644
--- a/addons/report_crm/i18n/pt.po
+++ b/addons/report_crm/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/pt_BR.po b/addons/report_crm/i18n/pt_BR.po
index 067ab7c6c9d..fcddbcb6904 100644
--- a/addons/report_crm/i18n/pt_BR.po
+++ b/addons/report_crm/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/ro.po b/addons/report_crm/i18n/ro.po
index d96665db213..7cf127f0d37 100644
--- a/addons/report_crm/i18n/ro.po
+++ b/addons/report_crm/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/ru.po b/addons/report_crm/i18n/ru.po
index f4b9605b404..6018257dd69 100644
--- a/addons/report_crm/i18n/ru.po
+++ b/addons/report_crm/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/sk.po b/addons/report_crm/i18n/sk.po
index 47b8280fbcd..8820939d49f 100644
--- a/addons/report_crm/i18n/sk.po
+++ b/addons/report_crm/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/sl.po b/addons/report_crm/i18n/sl.po
index 026f5a681e9..3725055667a 100644
--- a/addons/report_crm/i18n/sl.po
+++ b/addons/report_crm/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/sv.po b/addons/report_crm/i18n/sv.po
index 7fdd7390977..b36262502a1 100644
--- a/addons/report_crm/i18n/sv.po
+++ b/addons/report_crm/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/tlh.po b/addons/report_crm/i18n/tlh.po
index a4d602e7acf..d5677f83825 100644
--- a/addons/report_crm/i18n/tlh.po
+++ b/addons/report_crm/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/tr.po b/addons/report_crm/i18n/tr.po
index eea6c08ff17..e58f5302005 100644
--- a/addons/report_crm/i18n/tr.po
+++ b/addons/report_crm/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/uk.po b/addons/report_crm/i18n/uk.po
index dddd9fefd7c..48f69161ea4 100644
--- a/addons/report_crm/i18n/uk.po
+++ b/addons/report_crm/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/zh_CN.po b/addons/report_crm/i18n/zh_CN.po
index f6442e0d73a..c84cf2b8d48 100644
--- a/addons/report_crm/i18n/zh_CN.po
+++ b/addons/report_crm/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_crm/i18n/zh_TW.po b/addons/report_crm/i18n/zh_TW.po
index c9a0a7847e0..f38cfa0f923 100644
--- a/addons/report_crm/i18n/zh_TW.po
+++ b/addons/report_crm/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
diff --git a/addons/report_designer/__terp__.py b/addons/report_designer/__openerp__.py
similarity index 100%
rename from addons/report_designer/__terp__.py
rename to addons/report_designer/__openerp__.py
diff --git a/addons/report_document/i18n/ar.po b/addons/report_document/i18n/ar.po
index 725ffdcfa28..670c2730645 100644
--- a/addons/report_document/i18n/ar.po
+++ b/addons/report_document/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/bg.po b/addons/report_document/i18n/bg.po
index d18f08152f3..dc24a2ce056 100644
--- a/addons/report_document/i18n/bg.po
+++ b/addons/report_document/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/bs.po b/addons/report_document/i18n/bs.po
index 68d47c2fa1e..c2e159388fc 100644
--- a/addons/report_document/i18n/bs.po
+++ b/addons/report_document/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/ca.po b/addons/report_document/i18n/ca.po
index b301386cb65..06e7afaa367 100644
--- a/addons/report_document/i18n/ca.po
+++ b/addons/report_document/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/cs.po b/addons/report_document/i18n/cs.po
index 725ffdcfa28..670c2730645 100644
--- a/addons/report_document/i18n/cs.po
+++ b/addons/report_document/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/de.po b/addons/report_document/i18n/de.po
index 4bb144158a5..69c7c946c1f 100644
--- a/addons/report_document/i18n/de.po
+++ b/addons/report_document/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/es.po b/addons/report_document/i18n/es.po
index 76fa7437d82..4a11a5b8636 100644
--- a/addons/report_document/i18n/es.po
+++ b/addons/report_document/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/es_AR.po b/addons/report_document/i18n/es_AR.po
index ac99e1dc885..4206fd167aa 100644
--- a/addons/report_document/i18n/es_AR.po
+++ b/addons/report_document/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/et.po b/addons/report_document/i18n/et.po
index 9b14c66cbc0..083d827d30c 100644
--- a/addons/report_document/i18n/et.po
+++ b/addons/report_document/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/fr.po b/addons/report_document/i18n/fr.po
index 7fc9e6764ce..fa6b2dca27b 100644
--- a/addons/report_document/i18n/fr.po
+++ b/addons/report_document/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/hr.po b/addons/report_document/i18n/hr.po
index 1705946600c..c357a52df8f 100644
--- a/addons/report_document/i18n/hr.po
+++ b/addons/report_document/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_document/i18n/hu.po b/addons/report_document/i18n/hu.po
index 725ffdcfa28..670c2730645 100644
--- a/addons/report_document/i18n/hu.po
+++ b/addons/report_document/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/id.po b/addons/report_document/i18n/id.po
index 9c4abce49af..80505966f6f 100644
--- a/addons/report_document/i18n/id.po
+++ b/addons/report_document/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/it.po b/addons/report_document/i18n/it.po
index 23ea111cbc5..3f999d3622e 100644
--- a/addons/report_document/i18n/it.po
+++ b/addons/report_document/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/ko.po b/addons/report_document/i18n/ko.po
index 6d3ef607c4a..b2afd9d7dd4 100644
--- a/addons/report_document/i18n/ko.po
+++ b/addons/report_document/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/lt.po b/addons/report_document/i18n/lt.po
index 725ffdcfa28..670c2730645 100644
--- a/addons/report_document/i18n/lt.po
+++ b/addons/report_document/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/nl.po b/addons/report_document/i18n/nl.po
index 328c636f436..dc1ff56d68c 100644
--- a/addons/report_document/i18n/nl.po
+++ b/addons/report_document/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/nl_BE.po b/addons/report_document/i18n/nl_BE.po
index 3e2508368c1..2ae51a6e68b 100644
--- a/addons/report_document/i18n/nl_BE.po
+++ b/addons/report_document/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/pl.po b/addons/report_document/i18n/pl.po
index d6fecdf675c..1a5ecb89414 100644
--- a/addons/report_document/i18n/pl.po
+++ b/addons/report_document/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/pt.po b/addons/report_document/i18n/pt.po
index 9b6f057d4ee..0e376a0283b 100644
--- a/addons/report_document/i18n/pt.po
+++ b/addons/report_document/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/pt_BR.po b/addons/report_document/i18n/pt_BR.po
index 40031220b38..87679575845 100644
--- a/addons/report_document/i18n/pt_BR.po
+++ b/addons/report_document/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/ro.po b/addons/report_document/i18n/ro.po
index 725ffdcfa28..072ce610031 100644
--- a/addons/report_document/i18n/ro.po
+++ b/addons/report_document/i18n/ro.po
@@ -7,206 +7,208 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-04-15 10:57+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
 #: field:report.document.user,create_date:0
 #: field:report.files.partner,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Data creării"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_partner
 msgid "Files Per Month"
-msgstr ""
+msgstr "Fişiere pe lună"
 
 #. module: report_document
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+"special !"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_wall
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_shame
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Panoul ruşinii"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_files_partner
 msgid "Files details by Partners"
-msgstr ""
+msgstr "Detalii fişier după parteneri"
 
 #. module: report_document
 #: field:report.document.file,file_size:0
 #: field:report.document.user,file_size:0
 #: field:report.files.partner,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Mărime fişier"
 
 #. module: report_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acțiunii"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all
 msgid "All Months"
-msgstr ""
+msgstr "Toate lunile"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_myfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_myfile
 msgid "My files"
-msgstr ""
+msgstr "Fişierele mele"
 
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr ""
+msgstr "Fişiere după utilizatori"
 
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files"
-msgstr ""
+msgstr "Fişiere"
 
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "Fişiere pe lună"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree1
 msgid "My files (All months)"
-msgstr ""
+msgstr "Fişierele mele (toale lunile)"
 
 #. module: report_document
 #: field:report.document.wall,file_name:0
 msgid "Last Posted File Name"
-msgstr ""
+msgstr "Numele ultimului fişier postat"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report
 msgid "Reporting"
-msgstr ""
+msgstr "Raportare"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Utilizatori care nu au inserat documente în ultima lună"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document
 msgid "Document Management"
-msgstr ""
+msgstr "Managementul documentelor"
 
 #. module: report_document
 #: field:report.document.user,type:0
 #: field:report.files.partner,type:0
 msgid "Directory Type"
-msgstr ""
+msgstr "Tip de director"
 
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr ""
+msgstr "Fişiere după parteneri"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this
 msgid "This Month"
-msgstr ""
+msgstr "Luna curentă"
 
 #. module: report_document
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr ""
+msgstr "Utilizator"
 
 #. module: report_document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_userfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_userfile
 msgid "All Users files"
-msgstr ""
+msgstr "Fişierele tuturor utilizatorilor"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree
 msgid "My files (This months)"
-msgstr ""
+msgstr "Fişierele mele (luna curentă)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_user
 msgid "Files details by Users"
-msgstr ""
+msgstr "Detalii fişiere după utilizator"
 
 #. module: report_document
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Deținător"
 
 #. module: report_document
 #: field:report.document.file,nbr:0
 #: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
-msgstr ""
+msgstr "Număr de fişiere"
 
 #. module: report_document
 #: field:report.document.user,directory:0
 #: field:report.files.partner,directory:0
 msgid "Directory"
-msgstr ""
+msgstr "Director"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_user_graph
 msgid "Files By Users"
-msgstr ""
+msgstr "Fişiere după utilizatori"
 
 #. module: report_document
 #: model:ir.module.module,shortdesc:report_document.module_meta_information
 msgid "Document Management - Reporting"
-msgstr ""
+msgstr "Management documente - Raportări"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree1
 msgid "All Users files (All months)"
-msgstr ""
+msgstr "Toate fişierele utilizatorilor (toate lunile)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_file
 msgid "Files details by Directory"
-msgstr ""
+msgstr "Detalii fişiere după directoare"
 
 #. module: report_document
 #: field:report.document.user,change_date:0
 #: field:report.files.partner,change_date:0
 msgid "Modified Date"
-msgstr ""
+msgstr "Data modificării"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_size_month
 #: view:report.document.file:0
 msgid "File Size by Month"
-msgstr ""
+msgstr "Mărime fişiere pe luni"
 
 #. module: report_document
 #: field:report.document.user,file_title:0
 #: field:report.files.partner,file_title:0
 msgid "File Name"
-msgstr ""
+msgstr "Nume fișier"
 
 #. module: report_document
 #: field:report.document.file,month:0
@@ -216,32 +218,32 @@ msgstr ""
 #: field:report.document.wall,name:0
 #: field:report.files.partner,name:0
 msgid "Month"
-msgstr ""
+msgstr "Luna"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr ""
+msgstr "Fişiere pe luni"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr ""
+msgstr "Fişiere pe tipuri de resursă"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree
 msgid "All Users files (This month)"
-msgstr ""
+msgstr "Fişierele tuturor utilizatorilor (luna curentă)"
 
 #. module: report_document
 #: field:report.document.wall,last:0
 msgid "Last Posted Time"
-msgstr ""
+msgstr "Ora ultimei postări"
 
 #. module: report_document
 #: field:report.document.user,partner:0
 #: field:report.files.partner,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Partener"
diff --git a/addons/report_document/i18n/ru.po b/addons/report_document/i18n/ru.po
index c37f589720f..ac57a7af9b7 100644
--- a/addons/report_document/i18n/ru.po
+++ b/addons/report_document/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/sl.po b/addons/report_document/i18n/sl.po
index d4651fd7e25..714a8c43275 100644
--- a/addons/report_document/i18n/sl.po
+++ b/addons/report_document/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/sv.po b/addons/report_document/i18n/sv.po
index cd92165c270..c70678643ec 100644
--- a/addons/report_document/i18n/sv.po
+++ b/addons/report_document/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/tlh.po b/addons/report_document/i18n/tlh.po
index 771f018c153..a4e29fc7719 100644
--- a/addons/report_document/i18n/tlh.po
+++ b/addons/report_document/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/tr.po b/addons/report_document/i18n/tr.po
index 6eab5ac7582..de93d721896 100644
--- a/addons/report_document/i18n/tr.po
+++ b/addons/report_document/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/uk.po b/addons/report_document/i18n/uk.po
index 6f41154410d..fdfb7026a3c 100644
--- a/addons/report_document/i18n/uk.po
+++ b/addons/report_document/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/zh_CN.po b/addons/report_document/i18n/zh_CN.po
index 6c183a1037a..27bb5a2db73 100644
--- a/addons/report_document/i18n/zh_CN.po
+++ b/addons/report_document/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_document/i18n/zh_TW.po b/addons/report_document/i18n/zh_TW.po
index c9e5822fc85..2026caf3583 100644
--- a/addons/report_document/i18n/zh_TW.po
+++ b/addons/report_document/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
diff --git a/addons/report_intrastat/__terp__.py b/addons/report_intrastat/__openerp__.py
similarity index 100%
rename from addons/report_intrastat/__terp__.py
rename to addons/report_intrastat/__openerp__.py
diff --git a/addons/report_intrastat/i18n/ar.po b/addons/report_intrastat/i18n/ar.po
index 36dae840ac6..de572f139bf 100644
--- a/addons/report_intrastat/i18n/ar.po
+++ b/addons/report_intrastat/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/bg.po b/addons/report_intrastat/i18n/bg.po
index 5d63cea22a7..3ed25cbcdd3 100644
--- a/addons/report_intrastat/i18n/bg.po
+++ b/addons/report_intrastat/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/bs.po b/addons/report_intrastat/i18n/bs.po
index 1ba55d20540..f93fa7c84d0 100644
--- a/addons/report_intrastat/i18n/bs.po
+++ b/addons/report_intrastat/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/ca.po b/addons/report_intrastat/i18n/ca.po
index 3c380dd060d..fe7e73f998e 100644
--- a/addons/report_intrastat/i18n/ca.po
+++ b/addons/report_intrastat/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/cs.po b/addons/report_intrastat/i18n/cs.po
index 36dae840ac6..de572f139bf 100644
--- a/addons/report_intrastat/i18n/cs.po
+++ b/addons/report_intrastat/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/de.po b/addons/report_intrastat/i18n/de.po
index ab8fd49dd9a..6c8240fc1f9 100644
--- a/addons/report_intrastat/i18n/de.po
+++ b/addons/report_intrastat/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index 45f921f9306..a8b21b2371e 100644
--- a/addons/report_intrastat/i18n/es.po
+++ b/addons/report_intrastat/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/es_AR.po b/addons/report_intrastat/i18n/es_AR.po
index c961a67891f..30de0615d5c 100644
--- a/addons/report_intrastat/i18n/es_AR.po
+++ b/addons/report_intrastat/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/et.po b/addons/report_intrastat/i18n/et.po
index 8920ac739ee..2318d287f1d 100644
--- a/addons/report_intrastat/i18n/et.po
+++ b/addons/report_intrastat/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/fi.po b/addons/report_intrastat/i18n/fi.po
index 66334681103..bdaffbf7e9e 100644
--- a/addons/report_intrastat/i18n/fi.po
+++ b/addons/report_intrastat/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/fr.po b/addons/report_intrastat/i18n/fr.po
index 3e721b013af..5bab28a1bcd 100644
--- a/addons/report_intrastat/i18n/fr.po
+++ b/addons/report_intrastat/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/hr.po b/addons/report_intrastat/i18n/hr.po
index 98d08e5dca6..70646bd777f 100644
--- a/addons/report_intrastat/i18n/hr.po
+++ b/addons/report_intrastat/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_intrastat/i18n/hu.po b/addons/report_intrastat/i18n/hu.po
index 36dae840ac6..de572f139bf 100644
--- a/addons/report_intrastat/i18n/hu.po
+++ b/addons/report_intrastat/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/id.po b/addons/report_intrastat/i18n/id.po
index ead5783d9ee..c3be517ac02 100644
--- a/addons/report_intrastat/i18n/id.po
+++ b/addons/report_intrastat/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/it.po b/addons/report_intrastat/i18n/it.po
index f3ffbebceb3..809fddd8488 100644
--- a/addons/report_intrastat/i18n/it.po
+++ b/addons/report_intrastat/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/ko.po b/addons/report_intrastat/i18n/ko.po
index 204d0a32cf9..01ee3e8fecd 100644
--- a/addons/report_intrastat/i18n/ko.po
+++ b/addons/report_intrastat/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/lt.po b/addons/report_intrastat/i18n/lt.po
index 36dae840ac6..de572f139bf 100644
--- a/addons/report_intrastat/i18n/lt.po
+++ b/addons/report_intrastat/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/nl.po b/addons/report_intrastat/i18n/nl.po
index 4354decf790..22998c47067 100644
--- a/addons/report_intrastat/i18n/nl.po
+++ b/addons/report_intrastat/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/nl_BE.po b/addons/report_intrastat/i18n/nl_BE.po
index 2a280cefe7a..55eb0dff899 100644
--- a/addons/report_intrastat/i18n/nl_BE.po
+++ b/addons/report_intrastat/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/pl.po b/addons/report_intrastat/i18n/pl.po
index 0e296870906..681414a7b6e 100644
--- a/addons/report_intrastat/i18n/pl.po
+++ b/addons/report_intrastat/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/pt.po b/addons/report_intrastat/i18n/pt.po
index ca92943e0e7..d34b1776ac2 100644
--- a/addons/report_intrastat/i18n/pt.po
+++ b/addons/report_intrastat/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index ffd4eb5e5de..912d8ae9498 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/ro.po b/addons/report_intrastat/i18n/ro.po
index 36dae840ac6..de572f139bf 100644
--- a/addons/report_intrastat/i18n/ro.po
+++ b/addons/report_intrastat/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/ru.po b/addons/report_intrastat/i18n/ru.po
index f137f3a73ad..30eb54f4376 100644
--- a/addons/report_intrastat/i18n/ru.po
+++ b/addons/report_intrastat/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/sl.po b/addons/report_intrastat/i18n/sl.po
index 5109ac12f9a..49d1e4fde42 100644
--- a/addons/report_intrastat/i18n/sl.po
+++ b/addons/report_intrastat/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/sv.po b/addons/report_intrastat/i18n/sv.po
index 64dc425eb29..84f3f16b921 100644
--- a/addons/report_intrastat/i18n/sv.po
+++ b/addons/report_intrastat/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tlh.po b/addons/report_intrastat/i18n/tlh.po
index 313e00d5fc1..fefe1ecfa18 100644
--- a/addons/report_intrastat/i18n/tlh.po
+++ b/addons/report_intrastat/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+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 1c22a9b6572..0b01aada4d8 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/uk.po b/addons/report_intrastat/i18n/uk.po
index e7bdf277cc4..e6b95059d8b 100644
--- a/addons/report_intrastat/i18n/uk.po
+++ b/addons/report_intrastat/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/zh_CN.po b/addons/report_intrastat/i18n/zh_CN.po
index c674aa3ce9e..d8bbafe4acb 100644
--- a/addons/report_intrastat/i18n/zh_CN.po
+++ b/addons/report_intrastat/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/zh_TW.po b/addons/report_intrastat/i18n/zh_TW.po
index 75baaeae1f4..20f1908c62f 100644
--- a/addons/report_intrastat/i18n/zh_TW.po
+++ b/addons/report_intrastat/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index c021962ed09..e7a12e8ac5e 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -77,7 +77,7 @@
             <field name="arch" type="xml">
                 <tree string="Intrastat Data">
                     <field name="name" />
-	                <field name="month"/>
+                    <field name="month"/>
                     <field name="code"/>
                     <field name="ref"/>
                     <field name="intrastat_id"/>
@@ -96,16 +96,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
-                	<group col="10" colspan="4">
-                		<filter string="This Year" icon="terp-stock" domain="[('name','=',time.localtime()[0])]"/>
-						<filter string="This Month" icon="terp-stock" domain="[('month','=',time.localtime()[1])]"/>
-						<separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="code" select="1"/>
-	                    <field name="intrastat_id" select="1"/>
-	                    <field name="type" select="1"/>
-					</group>
+                    <group col="10" colspan="4">
+                        <filter string="This Year" icon="terp-stock" domain="[('name','=',time.localtime()[0])]"/>
+                        <filter string="This Month" icon="terp-stock" domain="[('month','=',time.localtime()[1])]"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="month" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="intrastat_id" select="1"/>
+                        <field name="type" select="1"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -119,6 +119,6 @@
             <field name="search_view_id" ref="view_report_intrastat_search"/>
         </record>
 
-		<menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="stock.next_id_61"/>
+        <menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="stock.next_id_61"/>
     </data>
 </openerp>
diff --git a/addons/report_mrp/i18n/ar.po b/addons/report_mrp/i18n/ar.po
index 70c5a9d90b3..6573309a281 100644
--- a/addons/report_mrp/i18n/ar.po
+++ b/addons/report_mrp/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/bg.po b/addons/report_mrp/i18n/bg.po
index 1eb54395ea3..c82aae7ad28 100644
--- a/addons/report_mrp/i18n/bg.po
+++ b/addons/report_mrp/i18n/bg.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 10:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-17 17:39+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@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-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
 msgid "Week"
-msgstr ""
+msgstr "Седмица"
 
 #. module: report_mrp
 #: constraint:ir.ui.view:0
@@ -43,17 +43,17 @@ msgstr ""
 #. module: report_mrp
 #: view:report.workcenter.load:0
 msgid "Workcenters load"
-msgstr ""
+msgstr "Натоварване на работните центрове"
 
 #. module: report_mrp
 #: model:ir.model,name:report_mrp.model_report_workcenter_load
 msgid "Workcenter Load"
-msgstr ""
+msgstr "Натоварване на работния центрър"
 
 #. module: report_mrp
 #: model:ir.module.module,shortdesc:report_mrp.module_meta_information
 msgid "MRP Management - Reporting"
-msgstr ""
+msgstr "MRP - Справки"
 
 #. module: report_mrp
 #: field:report.mrp.inout,value:0
diff --git a/addons/report_mrp/i18n/bs.po b/addons/report_mrp/i18n/bs.po
index df8055cfe1d..424837e48d0 100644
--- a/addons/report_mrp/i18n/bs.po
+++ b/addons/report_mrp/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/ca.po b/addons/report_mrp/i18n/ca.po
index 9194d8b427d..035d4e2746b 100644
--- a/addons/report_mrp/i18n/ca.po
+++ b/addons/report_mrp/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/cs.po b/addons/report_mrp/i18n/cs.po
index 549cd36c10e..d7073b4661b 100644
--- a/addons/report_mrp/i18n/cs.po
+++ b/addons/report_mrp/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/de.po b/addons/report_mrp/i18n/de.po
index 3637a4286e6..e4dae9eb96d 100644
--- a/addons/report_mrp/i18n/de.po
+++ b/addons/report_mrp/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/el.po b/addons/report_mrp/i18n/el.po
index 7ea981d4c22..c5f3ebd229c 100644
--- a/addons/report_mrp/i18n/el.po
+++ b/addons/report_mrp/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/es.po b/addons/report_mrp/i18n/es.po
index f597454c579..06cd76f1bba 100644
--- a/addons/report_mrp/i18n/es.po
+++ b/addons/report_mrp/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/es_AR.po b/addons/report_mrp/i18n/es_AR.po
index c567648df88..3c2a217c59a 100644
--- a/addons/report_mrp/i18n/es_AR.po
+++ b/addons/report_mrp/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/et.po b/addons/report_mrp/i18n/et.po
index 0175797f184..1a691fb96fc 100644
--- a/addons/report_mrp/i18n/et.po
+++ b/addons/report_mrp/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/fr.po b/addons/report_mrp/i18n/fr.po
index 1b2d8cc2661..bdf40192379 100644
--- a/addons/report_mrp/i18n/fr.po
+++ b/addons/report_mrp/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/hr.po b/addons/report_mrp/i18n/hr.po
index 4991b3f1125..fccb1f65d45 100644
--- a/addons/report_mrp/i18n/hr.po
+++ b/addons/report_mrp/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_mrp/i18n/hu.po b/addons/report_mrp/i18n/hu.po
index 70c5a9d90b3..6573309a281 100644
--- a/addons/report_mrp/i18n/hu.po
+++ b/addons/report_mrp/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/id.po b/addons/report_mrp/i18n/id.po
index 4d7b6e50afb..e68460e0b2c 100644
--- a/addons/report_mrp/i18n/id.po
+++ b/addons/report_mrp/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/it.po b/addons/report_mrp/i18n/it.po
index 0fdf4cfe692..f4c157d482b 100644
--- a/addons/report_mrp/i18n/it.po
+++ b/addons/report_mrp/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/ko.po b/addons/report_mrp/i18n/ko.po
index 0c7f6cbfd5e..1e77c7350b1 100644
--- a/addons/report_mrp/i18n/ko.po
+++ b/addons/report_mrp/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/lt.po b/addons/report_mrp/i18n/lt.po
index 2e6ae6c695c..6573309a281 100644
--- a/addons/report_mrp/i18n/lt.po
+++ b/addons/report_mrp/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/nl.po b/addons/report_mrp/i18n/nl.po
index 5712f80e1f4..c482d548a7b 100644
--- a/addons/report_mrp/i18n/nl.po
+++ b/addons/report_mrp/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/nl_BE.po b/addons/report_mrp/i18n/nl_BE.po
index f7a9494ebe6..643da69fb28 100644
--- a/addons/report_mrp/i18n/nl_BE.po
+++ b/addons/report_mrp/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/pl.po b/addons/report_mrp/i18n/pl.po
index 066729063cd..7113018ca0f 100644
--- a/addons/report_mrp/i18n/pl.po
+++ b/addons/report_mrp/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/pt.po b/addons/report_mrp/i18n/pt.po
index 4b946ca7c96..56aa3fd236b 100644
--- a/addons/report_mrp/i18n/pt.po
+++ b/addons/report_mrp/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/pt_BR.po b/addons/report_mrp/i18n/pt_BR.po
index 489d67ecd72..085de253a1f 100644
--- a/addons/report_mrp/i18n/pt_BR.po
+++ b/addons/report_mrp/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/ro.po b/addons/report_mrp/i18n/ro.po
index af9d44b6bfa..3ea97d6ff59 100644
--- a/addons/report_mrp/i18n/ro.po
+++ b/addons/report_mrp/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/ru.po b/addons/report_mrp/i18n/ru.po
index 8107181b9eb..00f76afb661 100644
--- a/addons/report_mrp/i18n/ru.po
+++ b/addons/report_mrp/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/sl.po b/addons/report_mrp/i18n/sl.po
index f600f8393f7..641648b0013 100644
--- a/addons/report_mrp/i18n/sl.po
+++ b/addons/report_mrp/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/sv.po b/addons/report_mrp/i18n/sv.po
index 92cf9b4313b..601f62359c4 100644
--- a/addons/report_mrp/i18n/sv.po
+++ b/addons/report_mrp/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/tlh.po b/addons/report_mrp/i18n/tlh.po
index 16e67dc8f58..e0adfc0c515 100644
--- a/addons/report_mrp/i18n/tlh.po
+++ b/addons/report_mrp/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/tr.po b/addons/report_mrp/i18n/tr.po
index eaee2b5652b..2018aad505b 100644
--- a/addons/report_mrp/i18n/tr.po
+++ b/addons/report_mrp/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/uk.po b/addons/report_mrp/i18n/uk.po
index 6169ae84120..ad6ff52633d 100644
--- a/addons/report_mrp/i18n/uk.po
+++ b/addons/report_mrp/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/zh_CN.po b/addons/report_mrp/i18n/zh_CN.po
index c6563bc8629..3e2c04cb773 100644
--- a/addons/report_mrp/i18n/zh_CN.po
+++ b/addons/report_mrp/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_mrp/i18n/zh_TW.po b/addons/report_mrp/i18n/zh_TW.po
index 37aba100df7..63a52340d03 100644
--- a/addons/report_mrp/i18n/zh_TW.po
+++ b/addons/report_mrp/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
diff --git a/addons/report_project/i18n/ar.po b/addons/report_project/i18n/ar.po
index c81e1f79b28..dd3ca93eaf3 100644
--- a/addons/report_project/i18n/ar.po
+++ b/addons/report_project/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/bg.po b/addons/report_project/i18n/bg.po
index a2e9351ab5a..16ea28c731c 100644
--- a/addons/report_project/i18n/bg.po
+++ b/addons/report_project/i18n/bg.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 12:45+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-17 17:35+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@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-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree_month
 msgid "Tasks finished by project (this month)"
-msgstr ""
+msgstr "Приключени задачи по проект (текущ месец)"
 
 #. module: report_project
 #: constraint:ir.model:0
@@ -34,60 +34,60 @@ msgstr ""
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree
 msgid "Tasks Closed by Project and User"
-msgstr ""
+msgstr "Приключени задачи по проект и по потребител"
 
 #. module: report_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree_month
 msgid "Tasks finished by project and user (this month)"
-msgstr ""
+msgstr "Приключени задачи по проект и по потребител (текущ месец)"
 
 #. module: report_project
 #: field:report.project.task,hours_effective:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Ефективни часове"
 
 #. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Задачи според потребител и проект"
 
 #. module: report_project
 #: field:report.project.task,task_closed:0
 #: field:report.project.task.user,task_closed:0
 msgid "Task Closed"
-msgstr ""
+msgstr "Приключване на задача"
 
 #. module: report_project
 #: view:report.project.task:0
 msgid "Tasks by Project"
-msgstr ""
+msgstr "Задачи по проект"
 
 #. module: report_project
 #: model:ir.module.module,shortdesc:report_project.module_meta_information
 msgid "Sales Management - Reporting"
-msgstr ""
+msgstr "Управление на продажби – справки"
 
 #. module: report_project
 #: field:report.project.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Потребител"
 
 #. module: report_project
 #: view:report.project.task.user:0
 msgid "Tasks by Project and User"
-msgstr ""
+msgstr "Задачи по проект и по потребител"
 
 #. module: report_project
 #: model:ir.ui.menu,name:report_project.next_id_63
 msgid "This Month"
-msgstr "Този месец"
+msgstr "Текущ месец"
 
 #. module: report_project
 #: constraint:ir.ui.view:0
@@ -97,25 +97,25 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: report_project
 #: view:report.project.task.user:0
 msgid "Tasks by projects and users"
-msgstr ""
+msgstr "Задачи по проекти и по потребители"
 
 #. module: report_project
 #: field:report.project.task,project_id:0
 #: field:report.project.task.user,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Проект"
 
 #. module: report_project
 #: field:report.project.task,closing_days:0
 #: field:report.project.task.user,closing_days:0
 msgid "Avg Closing Delay"
-msgstr ""
+msgstr "Прибл. закъснение на приключването"
 
 #. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task
 #: view:report.project.task:0
 msgid "Tasks by project"
-msgstr ""
+msgstr "Задачи по проект"
 
 #. module: report_project
 #: field:report.project.task,hours_delay:0
@@ -127,16 +127,16 @@ msgstr ""
 #: field:report.project.task,name:0
 #: field:report.project.task.user,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree
 msgid "Tasks Closed by Project"
-msgstr ""
+msgstr "Приключени задачи по проект"
 
 #. module: report_project
 #: field:report.project.task,hours_planned:0
 #: field:report.project.task.user,hours_planned:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Планирани часове"
diff --git a/addons/report_project/i18n/bs.po b/addons/report_project/i18n/bs.po
index 0fe10198539..da36196da2b 100644
--- a/addons/report_project/i18n/bs.po
+++ b/addons/report_project/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/ca.po b/addons/report_project/i18n/ca.po
index d0bcee3cc64..1aba2fc0973 100644
--- a/addons/report_project/i18n/ca.po
+++ b/addons/report_project/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/cs.po b/addons/report_project/i18n/cs.po
index c81e1f79b28..dd3ca93eaf3 100644
--- a/addons/report_project/i18n/cs.po
+++ b/addons/report_project/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/de.po b/addons/report_project/i18n/de.po
index 088b4162424..d083a67299a 100644
--- a/addons/report_project/i18n/de.po
+++ b/addons/report_project/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/es.po b/addons/report_project/i18n/es.po
index 78a660b375b..f90bbcc8623 100644
--- a/addons/report_project/i18n/es.po
+++ b/addons/report_project/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/es_AR.po b/addons/report_project/i18n/es_AR.po
index 0a6cfebfe1a..2bad98ccc56 100644
--- a/addons/report_project/i18n/es_AR.po
+++ b/addons/report_project/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/et.po b/addons/report_project/i18n/et.po
index f74d534c765..1a1aa42dd94 100644
--- a/addons/report_project/i18n/et.po
+++ b/addons/report_project/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/fr.po b/addons/report_project/i18n/fr.po
index 00f5459af3d..d46b23bf320 100644
--- a/addons/report_project/i18n/fr.po
+++ b/addons/report_project/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/hr.po b/addons/report_project/i18n/hr.po
index 10d8eda0174..e5bfa077090 100644
--- a/addons/report_project/i18n/hr.po
+++ b/addons/report_project/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_project/i18n/hu.po b/addons/report_project/i18n/hu.po
index c81e1f79b28..dd3ca93eaf3 100644
--- a/addons/report_project/i18n/hu.po
+++ b/addons/report_project/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/id.po b/addons/report_project/i18n/id.po
index 633c6590343..3a090656921 100644
--- a/addons/report_project/i18n/id.po
+++ b/addons/report_project/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/it.po b/addons/report_project/i18n/it.po
index 801d37dcca6..9e40aade5dc 100644
--- a/addons/report_project/i18n/it.po
+++ b/addons/report_project/i18n/it.po
@@ -13,14 +13,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_tree_month
 msgid "Tasks finished by project (this month)"
-msgstr ""
+msgstr "Attività concluse per progetto (questo mese)"
 
 #. module: report_project
 #: constraint:ir.model:0
@@ -39,13 +39,13 @@ msgstr "Attività Chiuse per Progetto e Utente"
 #. module: report_project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modulo non valido nella definizione dell'azione."
 
 #. module: report_project
 #: model:ir.actions.act_window,name:report_project.action_project_task_user_tree_month
 #: model:ir.ui.menu,name:report_project.menu_project_task_user_tree_month
 msgid "Tasks finished by project and user (this month)"
-msgstr ""
+msgstr "Attività concluse per progetto e utente (questo mese)"
 
 #. module: report_project
 #: field:report.project.task,hours_effective:0
@@ -72,7 +72,7 @@ msgstr "Attività per Progetto"
 #. module: report_project
 #: model:ir.module.module,shortdesc:report_project.module_meta_information
 msgid "Sales Management - Reporting"
-msgstr ""
+msgstr "Gestione vendite - Segnalazione"
 
 #. module: report_project
 #: field:report.project.task.user,user_id:0
diff --git a/addons/report_project/i18n/ko.po b/addons/report_project/i18n/ko.po
index 43883beba49..92e84812b76 100644
--- a/addons/report_project/i18n/ko.po
+++ b/addons/report_project/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/lt.po b/addons/report_project/i18n/lt.po
index c81e1f79b28..dd3ca93eaf3 100644
--- a/addons/report_project/i18n/lt.po
+++ b/addons/report_project/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/nl.po b/addons/report_project/i18n/nl.po
index d351046c008..ff9a23d3ee2 100644
--- a/addons/report_project/i18n/nl.po
+++ b/addons/report_project/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/nl_BE.po b/addons/report_project/i18n/nl_BE.po
index 09b6e6b0c58..37fc60d7d7f 100644
--- a/addons/report_project/i18n/nl_BE.po
+++ b/addons/report_project/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/pl.po b/addons/report_project/i18n/pl.po
index c32032f54bd..ae5bc4f5ef2 100644
--- a/addons/report_project/i18n/pl.po
+++ b/addons/report_project/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/pt.po b/addons/report_project/i18n/pt.po
index cfb60ed8b41..e99b15b9df8 100644
--- a/addons/report_project/i18n/pt.po
+++ b/addons/report_project/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/pt_BR.po b/addons/report_project/i18n/pt_BR.po
index f67ccc4d1ec..3da7108542e 100644
--- a/addons/report_project/i18n/pt_BR.po
+++ b/addons/report_project/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/ro.po b/addons/report_project/i18n/ro.po
index c81e1f79b28..dd3ca93eaf3 100644
--- a/addons/report_project/i18n/ro.po
+++ b/addons/report_project/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/ru.po b/addons/report_project/i18n/ru.po
index 734af555c1e..1acae911467 100644
--- a/addons/report_project/i18n/ru.po
+++ b/addons/report_project/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/sl.po b/addons/report_project/i18n/sl.po
index d1c087c9823..04c1bb56bbe 100644
--- a/addons/report_project/i18n/sl.po
+++ b/addons/report_project/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/sv.po b/addons/report_project/i18n/sv.po
index 273a2bc1910..1ea1751a921 100644
--- a/addons/report_project/i18n/sv.po
+++ b/addons/report_project/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/tlh.po b/addons/report_project/i18n/tlh.po
index 3f1eeb913c6..5795200ff37 100644
--- a/addons/report_project/i18n/tlh.po
+++ b/addons/report_project/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/tr.po b/addons/report_project/i18n/tr.po
index d83a16ad6fc..3e5dbc46e69 100644
--- a/addons/report_project/i18n/tr.po
+++ b/addons/report_project/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/uk.po b/addons/report_project/i18n/uk.po
index 4bfe3328b32..7ee17d19375 100644
--- a/addons/report_project/i18n/uk.po
+++ b/addons/report_project/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/zh_CN.po b/addons/report_project/i18n/zh_CN.po
index e9b59cca9c3..559a44c11d5 100644
--- a/addons/report_project/i18n/zh_CN.po
+++ b/addons/report_project/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_project/i18n/zh_TW.po b/addons/report_project/i18n/zh_TW.po
index 3e63db02d25..0088cbedba4 100644
--- a/addons/report_project/i18n/zh_TW.po
+++ b/addons/report_project/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
diff --git a/addons/report_purchase/i18n/ar.po b/addons/report_purchase/i18n/ar.po
index c55678fcca7..ffe2bd69f90 100644
--- a/addons/report_purchase/i18n/ar.po
+++ b/addons/report_purchase/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/bg.po b/addons/report_purchase/i18n/bg.po
index c5f107581dd..3cb51cac28e 100644
--- a/addons/report_purchase/i18n/bg.po
+++ b/addons/report_purchase/i18n/bg.po
@@ -7,49 +7,49 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 17:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-17 17:19+0000\n"
+"Last-Translator: Boris <boris.t.ivanov@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-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,price_average:0
 #: field:report.purchase.order.product,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Средна цена"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,state:0
 #: field:report.purchase.order.product,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Състояние на поръчка"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_category_tree_all
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_category_all
 #: view:report.purchase.order.category:0
 msgid "Purchases by Category of Products"
-msgstr ""
+msgstr "Покупки по категории продукти"
 
 #. module: report_purchase
 #: model:ir.model,name:report_purchase.model_report_purchase_order_product
 msgid "Purchases Orders by Products"
-msgstr ""
+msgstr "Поръчки за покупки по продукти"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree_all
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_product_all
 msgid "Purchases by Products"
-msgstr ""
+msgstr "Покупки по продукти"
 
 #. module: report_purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаването на действие."
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_75
@@ -74,17 +74,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:report_purchase.action_order_product_tree
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_product
 msgid "Purchases by Products (this month)"
-msgstr ""
+msgstr "Покупки по продукти (текущ месец)"
 
 #. module: report_purchase
 #: model:ir.model,name:report_purchase.model_report_purchase_order_category
 msgid "Purchases Orders by Categories"
-msgstr ""
+msgstr "Попъчки за покупки по категории"
 
 #. module: report_purchase
 #: field:report.purchase.order.product,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Продукт"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_73
@@ -94,19 +94,19 @@ msgstr "Справки"
 #. module: report_purchase
 #: model:ir.module.module,shortdesc:report_purchase.module_meta_information
 msgid "Purchase Management - Reporting"
-msgstr ""
+msgstr "Управление на покупки - докладване"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Грешка при фактуриране"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,price_total:0
 #: field:report.purchase.order.product,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Крайна цена"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,quantity:0
@@ -117,18 +117,18 @@ msgstr ""
 #. module: report_purchase
 #: view:report.purchase.order.product:0
 msgid "Purchases by products"
-msgstr ""
+msgstr "Покупки по продукти"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.act_product_category_2_report_purchase_order_category
 #: model:ir.actions.act_window,name:report_purchase.act_product_product_2_report_purchases_order_product
 msgid "Monthly purchases"
-msgstr ""
+msgstr "Месечни покупки"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_74
 msgid "This Month"
-msgstr "Този месец"
+msgstr "Текущ месец"
 
 #. module: report_purchase
 #: model:ir.module.module,description:report_purchase.module_meta_information
@@ -142,7 +142,7 @@ msgstr ""
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Оферта"
 
 #. module: report_purchase
 #: constraint:ir.ui.view:0
@@ -153,31 +153,31 @@ msgstr "Невалиден XML за преглед на архитектурат
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Ръчно в изпълнение"
 
 #. module: report_purchase
 #: model:ir.actions.act_window,name:report_purchase.action_order_category_tree
 #: model:ir.ui.menu,name:report_purchase.menu_report_order_category
 msgid "Purchases by Category of Product (this month)"
-msgstr ""
+msgstr "Покупки по категория на продукт (текущ месец)"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Грешка при доставка"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "In progress"
-msgstr ""
+msgstr "Извършва се"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,name:0
 #: field:report.purchase.order.product,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: report_purchase
 #: field:report.purchase.order.product,count:0
@@ -188,15 +188,15 @@ msgstr ""
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Done"
-msgstr ""
+msgstr "Готово"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,category_id:0
 msgid "Categories"
-msgstr ""
+msgstr "Категории"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
 #: selection:report.purchase.order.product,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отказ"
diff --git a/addons/report_purchase/i18n/bs.po b/addons/report_purchase/i18n/bs.po
index 599fb4c201d..3dffc68cab4 100644
--- a/addons/report_purchase/i18n/bs.po
+++ b/addons/report_purchase/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/ca.po b/addons/report_purchase/i18n/ca.po
index f14120d90f3..e6d7998c348 100644
--- a/addons/report_purchase/i18n/ca.po
+++ b/addons/report_purchase/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/cs.po b/addons/report_purchase/i18n/cs.po
index c55678fcca7..ffe2bd69f90 100644
--- a/addons/report_purchase/i18n/cs.po
+++ b/addons/report_purchase/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/de.po b/addons/report_purchase/i18n/de.po
index 464cf3ebd41..eee95e9807b 100644
--- a/addons/report_purchase/i18n/de.po
+++ b/addons/report_purchase/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/el.po b/addons/report_purchase/i18n/el.po
index 25e1cf3eaf9..d4b950c3da8 100644
--- a/addons/report_purchase/i18n/el.po
+++ b/addons/report_purchase/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/es.po b/addons/report_purchase/i18n/es.po
index 80abed64cfb..876e7ba4598 100644
--- a/addons/report_purchase/i18n/es.po
+++ b/addons/report_purchase/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/es_AR.po b/addons/report_purchase/i18n/es_AR.po
index 5b0404e78b3..26e5f3a29b4 100644
--- a/addons/report_purchase/i18n/es_AR.po
+++ b/addons/report_purchase/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/et.po b/addons/report_purchase/i18n/et.po
index a2a3319c0d0..178e6e781ce 100644
--- a/addons/report_purchase/i18n/et.po
+++ b/addons/report_purchase/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/fr.po b/addons/report_purchase/i18n/fr.po
index 80ac826311d..ef3c083360e 100644
--- a/addons/report_purchase/i18n/fr.po
+++ b/addons/report_purchase/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/hr.po b/addons/report_purchase/i18n/hr.po
index b1d46249c00..35c7a3d8ce8 100644
--- a/addons/report_purchase/i18n/hr.po
+++ b/addons/report_purchase/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_purchase/i18n/hu.po b/addons/report_purchase/i18n/hu.po
index c55678fcca7..ffe2bd69f90 100644
--- a/addons/report_purchase/i18n/hu.po
+++ b/addons/report_purchase/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/id.po b/addons/report_purchase/i18n/id.po
index 802137db904..72136fd81bb 100644
--- a/addons/report_purchase/i18n/id.po
+++ b/addons/report_purchase/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/it.po b/addons/report_purchase/i18n/it.po
index f5a92b37518..0005a6b4044 100644
--- a/addons/report_purchase/i18n/it.po
+++ b/addons/report_purchase/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po
index acaed1974e2..4bdec1193dd 100644
--- a/addons/report_purchase/i18n/ko.po
+++ b/addons/report_purchase/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/lt.po b/addons/report_purchase/i18n/lt.po
index c55678fcca7..ffe2bd69f90 100644
--- a/addons/report_purchase/i18n/lt.po
+++ b/addons/report_purchase/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/nl.po b/addons/report_purchase/i18n/nl.po
index 6102bf29568..e90161089b7 100644
--- a/addons/report_purchase/i18n/nl.po
+++ b/addons/report_purchase/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/nl_BE.po b/addons/report_purchase/i18n/nl_BE.po
index 02531b497bf..b7483840546 100644
--- a/addons/report_purchase/i18n/nl_BE.po
+++ b/addons/report_purchase/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/pl.po b/addons/report_purchase/i18n/pl.po
index 84835fd44f2..25e17d830de 100644
--- a/addons/report_purchase/i18n/pl.po
+++ b/addons/report_purchase/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/pt.po b/addons/report_purchase/i18n/pt.po
index 2aa15788eb0..87065207961 100644
--- a/addons/report_purchase/i18n/pt.po
+++ b/addons/report_purchase/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/pt_BR.po b/addons/report_purchase/i18n/pt_BR.po
index 4f2287d6bd9..eab1839aef7 100644
--- a/addons/report_purchase/i18n/pt_BR.po
+++ b/addons/report_purchase/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/ro.po b/addons/report_purchase/i18n/ro.po
index c55678fcca7..ffe2bd69f90 100644
--- a/addons/report_purchase/i18n/ro.po
+++ b/addons/report_purchase/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/ru.po b/addons/report_purchase/i18n/ru.po
index 15db000100d..340492f9121 100644
--- a/addons/report_purchase/i18n/ru.po
+++ b/addons/report_purchase/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/sl.po b/addons/report_purchase/i18n/sl.po
index 74b4a375f9f..1b354542fe4 100644
--- a/addons/report_purchase/i18n/sl.po
+++ b/addons/report_purchase/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/sv.po b/addons/report_purchase/i18n/sv.po
index 50453743780..51189d755d9 100644
--- a/addons/report_purchase/i18n/sv.po
+++ b/addons/report_purchase/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/tlh.po b/addons/report_purchase/i18n/tlh.po
index ed9b936fbe6..995124f7401 100644
--- a/addons/report_purchase/i18n/tlh.po
+++ b/addons/report_purchase/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/tr.po b/addons/report_purchase/i18n/tr.po
index e8bc9dc5183..30af23d8003 100644
--- a/addons/report_purchase/i18n/tr.po
+++ b/addons/report_purchase/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/uk.po b/addons/report_purchase/i18n/uk.po
index 05494a45b3c..b6b6ed7b8ae 100644
--- a/addons/report_purchase/i18n/uk.po
+++ b/addons/report_purchase/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/zh_CN.po b/addons/report_purchase/i18n/zh_CN.po
index ccd8fc5f729..e72663cd5b6 100644
--- a/addons/report_purchase/i18n/zh_CN.po
+++ b/addons/report_purchase/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_purchase/i18n/zh_TW.po b/addons/report_purchase/i18n/zh_TW.po
index 2c1f31ab0ae..d5b721b6775 100644
--- a/addons/report_purchase/i18n/zh_TW.po
+++ b/addons/report_purchase/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/report_sale/i18n/ar.po b/addons/report_sale/i18n/ar.po
index c63fd3c8453..a262ed32fe6 100644
--- a/addons/report_sale/i18n/ar.po
+++ b/addons/report_sale/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/bg.po b/addons/report_sale/i18n/bg.po
index 0930c149bbf..4d050aa8552 100644
--- a/addons/report_sale/i18n/bg.po
+++ b/addons/report_sale/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/bs.po b/addons/report_sale/i18n/bs.po
index 7d8dbcd3905..a6bbcf3494c 100644
--- a/addons/report_sale/i18n/bs.po
+++ b/addons/report_sale/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/ca.po b/addons/report_sale/i18n/ca.po
index 583fd41fa63..69deb222f9e 100644
--- a/addons/report_sale/i18n/ca.po
+++ b/addons/report_sale/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/cs.po b/addons/report_sale/i18n/cs.po
index c63fd3c8453..a262ed32fe6 100644
--- a/addons/report_sale/i18n/cs.po
+++ b/addons/report_sale/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/de.po b/addons/report_sale/i18n/de.po
index 8a2a9f986e4..d9d7525ecb2 100644
--- a/addons/report_sale/i18n/de.po
+++ b/addons/report_sale/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/el.po b/addons/report_sale/i18n/el.po
index 23bcee3287c..0b27dcef9a6 100644
--- a/addons/report_sale/i18n/el.po
+++ b/addons/report_sale/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/es.po b/addons/report_sale/i18n/es.po
index fc9bca02453..557e45d78c0 100644
--- a/addons/report_sale/i18n/es.po
+++ b/addons/report_sale/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/es_AR.po b/addons/report_sale/i18n/es_AR.po
index a9eda5c8b98..18f548a07c2 100644
--- a/addons/report_sale/i18n/es_AR.po
+++ b/addons/report_sale/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/et.po b/addons/report_sale/i18n/et.po
index 2e15d1fb077..0c47c43d353 100644
--- a/addons/report_sale/i18n/et.po
+++ b/addons/report_sale/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/fi.po b/addons/report_sale/i18n/fi.po
index 738606df609..2be12ddca3f 100644
--- a/addons/report_sale/i18n/fi.po
+++ b/addons/report_sale/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/fr.po b/addons/report_sale/i18n/fr.po
index 5b5ad5e993a..760ccef161d 100644
--- a/addons/report_sale/i18n/fr.po
+++ b/addons/report_sale/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/hr.po b/addons/report_sale/i18n/hr.po
index ed78cc96e26..6e2d5c4d644 100644
--- a/addons/report_sale/i18n/hr.po
+++ b/addons/report_sale/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_sale/i18n/hu.po b/addons/report_sale/i18n/hu.po
index c63fd3c8453..bd31b473911 100644
--- a/addons/report_sale/i18n/hu.po
+++ b/addons/report_sale/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/id.po b/addons/report_sale/i18n/id.po
index ff4637533f0..e529273ac36 100644
--- a/addons/report_sale/i18n/id.po
+++ b/addons/report_sale/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/it.po b/addons/report_sale/i18n/it.po
index 46da36782b2..b24ca0d17e5 100644
--- a/addons/report_sale/i18n/it.po
+++ b/addons/report_sale/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/ko.po b/addons/report_sale/i18n/ko.po
index 6b64500cd28..04b92ad416b 100644
--- a/addons/report_sale/i18n/ko.po
+++ b/addons/report_sale/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/lt.po b/addons/report_sale/i18n/lt.po
index c63fd3c8453..bd31b473911 100644
--- a/addons/report_sale/i18n/lt.po
+++ b/addons/report_sale/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/nl.po b/addons/report_sale/i18n/nl.po
index cf2ec761134..129d406568e 100644
--- a/addons/report_sale/i18n/nl.po
+++ b/addons/report_sale/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/nl_BE.po b/addons/report_sale/i18n/nl_BE.po
index d65389303e7..675bbf92faf 100644
--- a/addons/report_sale/i18n/nl_BE.po
+++ b/addons/report_sale/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/pl.po b/addons/report_sale/i18n/pl.po
index ae1f4d0dd48..dda56b1a616 100644
--- a/addons/report_sale/i18n/pl.po
+++ b/addons/report_sale/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/pt.po b/addons/report_sale/i18n/pt.po
index ebd6ab34939..1cf5ef5f36b 100644
--- a/addons/report_sale/i18n/pt.po
+++ b/addons/report_sale/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/pt_BR.po b/addons/report_sale/i18n/pt_BR.po
index 7214233e4c4..7c1810ed62e 100644
--- a/addons/report_sale/i18n/pt_BR.po
+++ b/addons/report_sale/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/ro.po b/addons/report_sale/i18n/ro.po
index dfb95957913..79239eb3296 100644
--- a/addons/report_sale/i18n/ro.po
+++ b/addons/report_sale/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/ru.po b/addons/report_sale/i18n/ru.po
index 0e42bc6d352..d3112d85ed1 100644
--- a/addons/report_sale/i18n/ru.po
+++ b/addons/report_sale/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/sl.po b/addons/report_sale/i18n/sl.po
index bc96ed374c6..03b609dce76 100644
--- a/addons/report_sale/i18n/sl.po
+++ b/addons/report_sale/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/sv.po b/addons/report_sale/i18n/sv.po
index 2a91f57c87f..1fd4952e0c5 100644
--- a/addons/report_sale/i18n/sv.po
+++ b/addons/report_sale/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/tlh.po b/addons/report_sale/i18n/tlh.po
index 01cef300c94..28bb0cb63f3 100644
--- a/addons/report_sale/i18n/tlh.po
+++ b/addons/report_sale/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/tr.po b/addons/report_sale/i18n/tr.po
index 384351003d6..57b4fd9143b 100644
--- a/addons/report_sale/i18n/tr.po
+++ b/addons/report_sale/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/uk.po b/addons/report_sale/i18n/uk.po
index d66f5ddc603..b3b218fbcf4 100644
--- a/addons/report_sale/i18n/uk.po
+++ b/addons/report_sale/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/zh_CN.po b/addons/report_sale/i18n/zh_CN.po
index c8ef8b55d79..d28060bc0a2 100644
--- a/addons/report_sale/i18n/zh_CN.po
+++ b/addons/report_sale/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_sale/i18n/zh_TW.po b/addons/report_sale/i18n/zh_TW.po
index a95a2d5c1a0..d804093bd20 100644
--- a/addons/report_sale/i18n/zh_TW.po
+++ b/addons/report_sale/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
diff --git a/addons/report_task/i18n/ar.po b/addons/report_task/i18n/ar.po
index 4aaa707fe07..59de670f7c0 100644
--- a/addons/report_task/i18n/ar.po
+++ b/addons/report_task/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/bg.po b/addons/report_task/i18n/bg.po
index 2331c52da07..ad9251def0b 100644
--- a/addons/report_task/i18n/bg.po
+++ b/addons/report_task/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/bs.po b/addons/report_task/i18n/bs.po
index c4b2f3541ca..27446a6db09 100644
--- a/addons/report_task/i18n/bs.po
+++ b/addons/report_task/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/ca.po b/addons/report_task/i18n/ca.po
index 438badf71f2..c8e081d33fb 100644
--- a/addons/report_task/i18n/ca.po
+++ b/addons/report_task/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/cs.po b/addons/report_task/i18n/cs.po
index 4aaa707fe07..34b02871b94 100644
--- a/addons/report_task/i18n/cs.po
+++ b/addons/report_task/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/de.po b/addons/report_task/i18n/de.po
index fdd5ab92564..f4c6dbc37a8 100644
--- a/addons/report_task/i18n/de.po
+++ b/addons/report_task/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/es.po b/addons/report_task/i18n/es.po
index 21766fd6ba5..0f580ae034e 100644
--- a/addons/report_task/i18n/es.po
+++ b/addons/report_task/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/es_AR.po b/addons/report_task/i18n/es_AR.po
index c580497ace4..9b1717d8205 100644
--- a/addons/report_task/i18n/es_AR.po
+++ b/addons/report_task/i18n/es_AR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/et.po b/addons/report_task/i18n/et.po
index df5b922f0d7..e4044db7026 100644
--- a/addons/report_task/i18n/et.po
+++ b/addons/report_task/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/fr.po b/addons/report_task/i18n/fr.po
index c01fd6f0f0a..e0e125dcf4d 100644
--- a/addons/report_task/i18n/fr.po
+++ b/addons/report_task/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/hr.po b/addons/report_task/i18n/hr.po
index f19dadfac5e..d7b02c938ce 100644
--- a/addons/report_task/i18n/hr.po
+++ b/addons/report_task/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_task/i18n/hu.po b/addons/report_task/i18n/hu.po
index 4aaa707fe07..34b02871b94 100644
--- a/addons/report_task/i18n/hu.po
+++ b/addons/report_task/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/id.po b/addons/report_task/i18n/id.po
index b35e00c9651..0ae6b302352 100644
--- a/addons/report_task/i18n/id.po
+++ b/addons/report_task/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/it.po b/addons/report_task/i18n/it.po
index 5c44deeef92..a6366571fb7 100644
--- a/addons/report_task/i18n/it.po
+++ b/addons/report_task/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/lt.po b/addons/report_task/i18n/lt.po
index 4aaa707fe07..34b02871b94 100644
--- a/addons/report_task/i18n/lt.po
+++ b/addons/report_task/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/nl.po b/addons/report_task/i18n/nl.po
index 7ebd85e4871..6229ab5d7d1 100644
--- a/addons/report_task/i18n/nl.po
+++ b/addons/report_task/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/nl_BE.po b/addons/report_task/i18n/nl_BE.po
index f28f4e2773c..5368696826c 100644
--- a/addons/report_task/i18n/nl_BE.po
+++ b/addons/report_task/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/pl.po b/addons/report_task/i18n/pl.po
index 5f9bfbc96e7..e488e2e82a7 100644
--- a/addons/report_task/i18n/pl.po
+++ b/addons/report_task/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/pt.po b/addons/report_task/i18n/pt.po
index af40af291f5..35ec131e27f 100644
--- a/addons/report_task/i18n/pt.po
+++ b/addons/report_task/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/pt_BR.po b/addons/report_task/i18n/pt_BR.po
index fa5d9f063df..df501e4f26a 100644
--- a/addons/report_task/i18n/pt_BR.po
+++ b/addons/report_task/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/ro.po b/addons/report_task/i18n/ro.po
index 4aaa707fe07..34b02871b94 100644
--- a/addons/report_task/i18n/ro.po
+++ b/addons/report_task/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/ru.po b/addons/report_task/i18n/ru.po
index 1e8f5611985..575343b051c 100644
--- a/addons/report_task/i18n/ru.po
+++ b/addons/report_task/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/sl.po b/addons/report_task/i18n/sl.po
index 6a53d48a379..bd1dd4cf724 100644
--- a/addons/report_task/i18n/sl.po
+++ b/addons/report_task/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/sv.po b/addons/report_task/i18n/sv.po
index 04dbba8f85c..37e6a79bfc9 100644
--- a/addons/report_task/i18n/sv.po
+++ b/addons/report_task/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/tr.po b/addons/report_task/i18n/tr.po
index ec3be0289d4..fd88c6cf8b9 100644
--- a/addons/report_task/i18n/tr.po
+++ b/addons/report_task/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/uk.po b/addons/report_task/i18n/uk.po
index cecdaa39ac8..9370caf62cc 100644
--- a/addons/report_task/i18n/uk.po
+++ b/addons/report_task/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/zh_CN.po b/addons/report_task/i18n/zh_CN.po
index c9e27d84fa5..c75633d467f 100644
--- a/addons/report_task/i18n/zh_CN.po
+++ b/addons/report_task/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_task/i18n/zh_TW.po b/addons/report_task/i18n/zh_TW.po
index 4aaa707fe07..34b02871b94 100644
--- a/addons/report_task/i18n/zh_TW.po
+++ b/addons/report_task/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/report_timesheet/i18n/ar.po b/addons/report_timesheet/i18n/ar.po
index aa3e172e0de..b4b7620ea56 100644
--- a/addons/report_timesheet/i18n/ar.po
+++ b/addons/report_timesheet/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/bg.po b/addons/report_timesheet/i18n/bg.po
index 431d8fd0fb2..b45cd07fc06 100644
--- a/addons/report_timesheet/i18n/bg.po
+++ b/addons/report_timesheet/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/bs.po b/addons/report_timesheet/i18n/bs.po
index 4b3dea79bbe..649fef541eb 100644
--- a/addons/report_timesheet/i18n/bs.po
+++ b/addons/report_timesheet/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/ca.po b/addons/report_timesheet/i18n/ca.po
index babf0e446ab..3273e75f977 100644
--- a/addons/report_timesheet/i18n/ca.po
+++ b/addons/report_timesheet/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/cs.po b/addons/report_timesheet/i18n/cs.po
index aa3e172e0de..b4b7620ea56 100644
--- a/addons/report_timesheet/i18n/cs.po
+++ b/addons/report_timesheet/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/de.po b/addons/report_timesheet/i18n/de.po
index cfdcb0412e8..734838c4f2d 100644
--- a/addons/report_timesheet/i18n/de.po
+++ b/addons/report_timesheet/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/es.po b/addons/report_timesheet/i18n/es.po
index 4c08c5d7bd5..01269187e32 100644
--- a/addons/report_timesheet/i18n/es.po
+++ b/addons/report_timesheet/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/es_AR.po b/addons/report_timesheet/i18n/es_AR.po
index 952be717aa4..4f2ad4b5890 100644
--- a/addons/report_timesheet/i18n/es_AR.po
+++ b/addons/report_timesheet/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/et.po b/addons/report_timesheet/i18n/et.po
index 333a3b063ea..339af514351 100644
--- a/addons/report_timesheet/i18n/et.po
+++ b/addons/report_timesheet/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/fr.po b/addons/report_timesheet/i18n/fr.po
index c6da4e9f8fd..560cb9b4e24 100644
--- a/addons/report_timesheet/i18n/fr.po
+++ b/addons/report_timesheet/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/hr.po b/addons/report_timesheet/i18n/hr.po
index 22e4503a66e..8777d4aef95 100644
--- a/addons/report_timesheet/i18n/hr.po
+++ b/addons/report_timesheet/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_timesheet/i18n/hu.po b/addons/report_timesheet/i18n/hu.po
index aa3e172e0de..b4b7620ea56 100644
--- a/addons/report_timesheet/i18n/hu.po
+++ b/addons/report_timesheet/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/id.po b/addons/report_timesheet/i18n/id.po
index c208edfd31b..5bec7153837 100644
--- a/addons/report_timesheet/i18n/id.po
+++ b/addons/report_timesheet/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/it.po b/addons/report_timesheet/i18n/it.po
index b6bc7f57584..1deea850919 100644
--- a/addons/report_timesheet/i18n/it.po
+++ b/addons/report_timesheet/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/ko.po b/addons/report_timesheet/i18n/ko.po
index 58f8c9b6e71..292d76ac588 100644
--- a/addons/report_timesheet/i18n/ko.po
+++ b/addons/report_timesheet/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/lt.po b/addons/report_timesheet/i18n/lt.po
index aa3e172e0de..b4b7620ea56 100644
--- a/addons/report_timesheet/i18n/lt.po
+++ b/addons/report_timesheet/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/nl.po b/addons/report_timesheet/i18n/nl.po
index a7cb2281052..5c80e2f4506 100644
--- a/addons/report_timesheet/i18n/nl.po
+++ b/addons/report_timesheet/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/nl_BE.po b/addons/report_timesheet/i18n/nl_BE.po
index cfd904767ab..48f25ac4401 100644
--- a/addons/report_timesheet/i18n/nl_BE.po
+++ b/addons/report_timesheet/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/pl.po b/addons/report_timesheet/i18n/pl.po
index 71b311f0d2b..93aa891f295 100644
--- a/addons/report_timesheet/i18n/pl.po
+++ b/addons/report_timesheet/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/pt.po b/addons/report_timesheet/i18n/pt.po
index 42a771036d5..b3e3d4505a6 100644
--- a/addons/report_timesheet/i18n/pt.po
+++ b/addons/report_timesheet/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/pt_BR.po b/addons/report_timesheet/i18n/pt_BR.po
index c49fd45f64d..e3aea8ad185 100644
--- a/addons/report_timesheet/i18n/pt_BR.po
+++ b/addons/report_timesheet/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/ro.po b/addons/report_timesheet/i18n/ro.po
index aa3e172e0de..b4b7620ea56 100644
--- a/addons/report_timesheet/i18n/ro.po
+++ b/addons/report_timesheet/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/ru.po b/addons/report_timesheet/i18n/ru.po
index ae9060363e4..650c77681ef 100644
--- a/addons/report_timesheet/i18n/ru.po
+++ b/addons/report_timesheet/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/sl.po b/addons/report_timesheet/i18n/sl.po
index 586dab7760e..1a2eab1c900 100644
--- a/addons/report_timesheet/i18n/sl.po
+++ b/addons/report_timesheet/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/sv.po b/addons/report_timesheet/i18n/sv.po
index 0e4b3e2b965..3c1e02f78fe 100644
--- a/addons/report_timesheet/i18n/sv.po
+++ b/addons/report_timesheet/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/tlh.po b/addons/report_timesheet/i18n/tlh.po
index 3c5e279ac13..006615cb971 100644
--- a/addons/report_timesheet/i18n/tlh.po
+++ b/addons/report_timesheet/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/tr.po b/addons/report_timesheet/i18n/tr.po
index 66c34a2206a..d81f4c32cd6 100644
--- a/addons/report_timesheet/i18n/tr.po
+++ b/addons/report_timesheet/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/uk.po b/addons/report_timesheet/i18n/uk.po
index 3d1e08a86e8..c06c4685bda 100644
--- a/addons/report_timesheet/i18n/uk.po
+++ b/addons/report_timesheet/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/zh_CN.po b/addons/report_timesheet/i18n/zh_CN.po
index 0ba43b66132..6c0606105b9 100644
--- a/addons/report_timesheet/i18n/zh_CN.po
+++ b/addons/report_timesheet/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/report_timesheet/i18n/zh_TW.po b/addons/report_timesheet/i18n/zh_TW.po
index 2901b2e035f..99933e81b90 100644
--- a/addons/report_timesheet/i18n/zh_TW.po
+++ b/addons/report_timesheet/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
diff --git a/addons/resource/__terp__.py b/addons/resource/__openerp__.py
similarity index 100%
rename from addons/resource/__terp__.py
rename to addons/resource/__openerp__.py
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 2a11795109b..8617e8a8f4c 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -13,7 +13,7 @@
                    <group>
                        <field name="name"/>
                        <field name="user_id" string="User" widget="selection">
-                           <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" string="My Resources"/>
+                           <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" name="my_resources"/>
                        </field>
                        <field name="resource_type"/>
                        <field name="company_id" widget="selection"/>
@@ -98,7 +98,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{"search_default_My Resources":1}</field>
+            <field name="context">{"search_default_my_resources":1}</field>
             <field name="search_view_id" ref="view_resource_calendar_search"/>
         </record>
 
diff --git a/addons/sale/__terp__.py b/addons/sale/__openerp__.py
similarity index 100%
rename from addons/sale/__terp__.py
rename to addons/sale/__openerp__.py
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index d59d888c21f..5b77ebf9637 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index efd28c0d903..d96676bbb4e 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index 5db744789b1..52cc5aee3f4 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 40a6d88145d..40ef81e54c5 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 7d79fd62ee2..3482f1274e3 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 83502d5de8a..10b6a1267b3 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-10 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 63597774fc1..c75cbfc1ff8 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 0a2a25ce5d9..f3d287801a8 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 27c43226991..b0cfd168ac5 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index fcbb972e6ac..2ff71b1de6e 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index 185974e129a..24791e42826 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 04d9d70f328..3d9f2727a80 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 9d96c065ef4..b2ba5dbc8d4 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index 5a3e081f82d..61466ebdca1 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 0d58f5b00fa..1d561923ce3 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 09:45+0000\n"
+"PO-Revision-Date: 2010-04-17 17:15+0000\n"
 "Last-Translator: opix <inur.opix@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Pengiriman Sebagian"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Procurement"
-msgstr ""
+msgstr "Pengadaan kembali"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr ""
+msgstr "Konfirmasi Penawaran"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
@@ -50,7 +50,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Jadwal Tunggu"
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -58,11 +58,13 @@ msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
 msgstr ""
+"Jika anda tidak mempunya cukup stok yang akan dikirim, apakah anda setuju "
+"jika hanya dikirim sebagian?"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr ""
+msgstr "dari stok"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
@@ -73,7 +75,7 @@ msgstr ""
 #: wizard_field:sale.advance_payment_inv,init,qtty:0
 #: rml:sale.order:0
 msgid "Quantity"
-msgstr ""
+msgstr "Kwantitas"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
@@ -84,18 +86,18 @@ msgstr "Invoice berhasil dibuat"
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Automatic Declaration"
-msgstr ""
+msgstr "Keterangan Otomatis"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr ""
+msgstr "Baris Order belum terinvoice dan belum terkirim"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Sebagai Konsep"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -106,12 +108,12 @@ msgstr ""
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this invoice"
-msgstr ""
+msgstr "Ini adalah daftar pengepakan yang telah dibuat untuk invoice ini"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Delivery, from the warehouse to the customer."
-msgstr ""
+msgstr "Pengiriman, dari gudang ke pelanggan"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_picking_policy
@@ -121,17 +123,17 @@ msgstr ""
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr ""
+msgstr "Validasi"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Buat Invoice"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Sub Total"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -144,12 +146,12 @@ msgstr ""
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Pembatalan Order"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
-msgstr ""
+msgstr "Perpindahan Barang"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -162,23 +164,23 @@ msgstr ""
 #: view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Catatan"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 msgid "Invoice after delivery"
-msgstr ""
+msgstr "Ditagihkan setelah pengiriman"
 
 #. module: sale
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Pajak-pajak"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Total Net :"
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -188,7 +190,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,state:0 selection:sale.order.line,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Dibatalkan"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -198,43 +200,43 @@ msgstr ""
 #. module: sale
 #: field:sale.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Asal"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Alamat Invoice"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Barang Keluar"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Reference"
-msgstr ""
+msgstr "Referensi"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr ""
+msgstr "Sekaligus"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
 msgid "Procurement is created after confirmation of sale order."
-msgstr ""
+msgstr "Pengadaan dibuat setelah order penjualan dikonfirmasi"
 
 #. module: sale
 #: field:sale.order,project_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Akun Analisis"
 
 #. module: sale
 #: rml:sale.order:0
@@ -244,33 +246,33 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Metode Pengadaan"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Penjelasan lebih lanjut"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: sale
 #: field:sale.order.line,price_net:0
 msgid "Net Price"
-msgstr ""
+msgstr "Harga Bersih"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree9
 #: model:ir.ui.menu,name:sale.menu_action_order_tree9
 msgid "My sales order in progress"
-msgstr ""
+msgstr "Penjualan saya yang masih dalam proses"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr ""
+msgstr "Kwantitas (UoS)"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -280,11 +282,16 @@ msgid ""
 "choose if you invoice based on ordered or shipped quantities. If the product "
 "is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
+"Order Penjualan sebara otomatis akan membuat konsep invoice. Kwantitas yang "
+"diorder dan yang terkirim mungkin tidak sama. Anda harus memilih, "
+"tagihan/invoice berdasarkan order atau kwantitas barang yang terkirim. Jika "
+"produk adalah jasa, maksud dari kwantitas yang terkirim adalah jumlah jam "
+"yang telah ditempuh dalam suatu pekerjaan"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Dikonfirmasi"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -295,61 +302,61 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.action_order_tree_all
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_all
 msgid "All Sales Order"
-msgstr ""
+msgstr "Semua Order Penjualan"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "Konfirmasi"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "Alamat Pengiriman"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr ""
+msgstr "Kwantitas Terkirim"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr ""
+msgstr "Tagihan/Invoice berdasakan pada Order Penjualan"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sale Shop"
-msgstr ""
+msgstr "Toko"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Gudang"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Order N°"
-msgstr ""
+msgstr "No. Order"
 
 #. module: sale
 #: field:sale.order,order_line:0
 #: view:sale.order.line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Baris Order"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Potongan (%)"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Detail Invoice"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
@@ -359,7 +366,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Total sebelum pajak"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -377,7 +384,7 @@ msgstr ""
 #. module: sale
 #: rml:sale.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Alamat pengiriman :"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -394,7 +401,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Manual Description"
-msgstr ""
+msgstr "Keterangan Manual"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
@@ -406,7 +413,7 @@ msgstr ""
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr ""
+msgstr "Baris Order Penjualan"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -421,40 +428,40 @@ msgstr ""
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Packing"
-msgstr ""
+msgstr "Kemasan"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "konnfirmasi Order"
 
 #. module: sale
 #: field:sale.order,name:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Referensi Order"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
 msgid "Done"
-msgstr ""
+msgstr "Selesai"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
 #: field:sale.shop,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Harga"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_shop_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Pengaturan"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -464,7 +471,7 @@ msgstr ""
 #. module: sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Salah dalam penyusunan format XML"
 
 #. module: sale
 #: field:sale.order,picking_ids:0
@@ -474,12 +481,12 @@ msgstr ""
 #. module: sale
 #: field:sale.shop,payment_account_id:0
 msgid "Payment Accounts"
-msgstr ""
+msgstr "Akun Pembayaran"
 
 #. module: sale
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Salah: UoS dan UoM harus berbeda kategori"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
@@ -489,46 +496,46 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Sales orders"
-msgstr ""
+msgstr "Order Penjualan"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
-msgstr ""
+msgstr "Pengadaan"
 
 #. module: sale
 #: view:sale.shop:0
 msgid "Payment accounts"
-msgstr ""
+msgstr "Akun Pembayaran"
 
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,create,end:0
 msgid "Close"
-msgstr ""
+msgstr "Selesai"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Konsep Invoice"
 
 #. module: sale
 #: wizard_field:sale.order.line.make_invoice,init,grouped:0
 #: wizard_field:sale.order.make_invoice,init,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Mengelompokan Invoice"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 #: model:ir.ui.menu,name:sale.menu_action_order_tree5
 msgid "All Quotations"
-msgstr ""
+msgstr "Semua Penawaran"
 
 #. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Potongan (%)"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
@@ -643,6 +650,8 @@ msgid ""
 "This Configuration step use to set default picking policy when make sale "
 "order"
 msgstr ""
+"Langkah konfigurasi ini digunakan untuk membuat standart pengepakan ketika "
+"membuat order penjualan"
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
@@ -1235,7 +1244,7 @@ msgstr ""
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "After confirming order, Create the invoice."
-msgstr ""
+msgstr "Setelah konfirmasi order, Buat Invoice"
 
 #. module: sale
 #: constraint:product.product:0
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 7436a4032fb..846764f2ee5 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index 7af6fa080b5..76534f8e861 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index bd7816ad6fa..d04d8b1889b 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index 1d7ef0aa976..d7d0512940a 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index e1736ad59b4..100ae40f99a 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index c9a2b9c6838..2454f253ba1 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-13 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index c6f138ee333..dc60e47b585 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index a6b5f6526e3..69aadf40820 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index f71d12df2be..75c3c0d1b22 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 24a23185207..d6858cc9f75 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index d8b8856f309..a0fdd4b4a97 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index 1726cc91102..38a869d124b 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+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 3f2b9cda58c..730c746a280 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+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 bf4aeac75cc..8910cbc44dd 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 1049e1f3fc1..c344f99509e 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+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 588570379b6..7a1332e05e2 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+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 523a034f64b..9ce5df7db09 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+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 3616941a39a..7f58e8be9bd 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 7e50a50a387..b411272bfc7 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 2e4d98fecc6..6d4668bbd21 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 106bdd8793d..5da1a96f8d4 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -33,7 +33,7 @@
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Sale Order Requisition&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Drives requisition orders for every sale order line.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Drives procurement orders for every sale order line.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_salesprocess0"/>
             <field name="process_id" ref="mrp.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
@@ -66,8 +66,8 @@
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Requisition Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;One requisition order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;One Procurement order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="mrp.process_process_procurementprocess0"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
@@ -158,8 +158,8 @@
 
         <record id="process_transition_saleprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Create Requisition Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;A requisition order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. &quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. &quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
         </record>
@@ -167,7 +167,7 @@
         <record id="process_transition_packing0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Pick List&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sale order is confirmed, in the same time as the requisition order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sale order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
         </record>
@@ -200,8 +200,8 @@
         <record id="process_transition_saleorderprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Requisition of sold material&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;For every sale order line, a requisition order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;For every sale order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
         </record>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 150542e2c7e..fb0ae387000 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -45,11 +45,11 @@
             <search string="Sale Orders">
                 <group>
                 <filter icon="terp-sale"
-                    string="This Year"
+                    string="This Year" name="this_year"
                     domain="[('year','=',time.strftime('%%Y'))]"
                     help="Sales orders of the year"/>
                 <filter icon="terp-sale"
-                    string="This Month"
+                    string="This Month" name="this_month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Sales orders of this month"/>
                 <separator orientation="vertical"/>
@@ -57,7 +57,7 @@
                     string="Quotations"
                     domain="[('state','=','draft')]"/>
                 <filter icon="terp-sale"
-                    string="Sales"
+                    string="Sales" name="sales"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
                 <separator orientation="vertical"/>
                 <field name="user_id" widget="selection">
@@ -73,7 +73,7 @@
                 <group expand="1" string="Group By..." >
                     <filter string="Company" icon="terp-sale" context="{'group_by':'company_id'}"/>
                     <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
-                    <filter string="Salesman" icon="terp-sale" context="{'group_by':'user_id'}" />
+                    <filter string="Salesman" name="by_user" icon="terp-sale" context="{'group_by':'user_id'}" />
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
                     <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
@@ -91,7 +91,7 @@
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_This Year":1,"search_default_This Month":1,"search_default_Sales":1,"search_default_Salesman":1}</field>
+        <field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_sales":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_order_product_search"/>
     </record>
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8b77719171a..718f29f12d7 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -43,7 +43,9 @@ class sale_shop(osv.osv):
 sale_shop()
 
 
-def _incoterm_get(self, cr, uid, context={}):
+def _incoterm_get(self, cr, uid, context=None):
+    if context is None:
+            context = {}
     cr.execute('select code, code||\', \'||name from stock_incoterms where active')
     return cr.fetchall()
 
@@ -52,7 +54,9 @@ class sale_order(osv.osv):
     _name = "sale.order"
     _description = "Sale Order"
 
-    def copy(self, cr, uid, id, default=None, context={}):
+    def copy(self, cr, uid, id, default=None, context=None):
+        if context is None:
+            context = {}
         if not default:
             default = {}
         default.update({
@@ -62,18 +66,22 @@ class sale_order(osv.osv):
             'picking_ids': [],
             'name': self.pool.get('ir.sequence').get(cr, uid, 'sale.order'),
         })
-        return super(sale_order, self).copy(cr, uid, id, default, context)
+        return super(sale_order, self).copy(cr, uid, id, default, context=context)
 
-    def _amount_line_tax(self, cr, uid, line, context={}):
+    def _amount_line_tax(self, cr, uid, line, context=None):
+        if context is None:
+            context = {}
         val = 0.0
         for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id):
             val += c['amount']
         return val
 
-    def _amount_all(self, cr, uid, ids, field_name, arg, context):
+    def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
+        if context is None:
+            context = {}
         res = {}
         cur_obj = self.pool.get('res.currency')
-        for order in self.browse(cr, uid, ids):
+        for order in self.browse(cr, uid, ids, context):
             res[order.id] = {
                 'amount_untaxed': 0.0,
                 'amount_tax': 0.0,
@@ -83,13 +91,15 @@ class sale_order(osv.osv):
             cur = order.pricelist_id.currency_id
             for line in order.order_line:
                 val1 += line.price_subtotal
-                val += self._amount_line_tax(cr, uid, line, context)
+                val += self._amount_line_tax(cr, uid, line, context=context)
             res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
             res[order.id]['amount_untaxed'] = cur_obj.round(cr, uid, cur, val1)
             res[order.id]['amount_total'] = res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
         return res
 
     def _picked_rate(self, cr, uid, ids, name, arg, context=None):
+        if context is None:
+            context = {}
         if not ids:
             return {}
         res = {}
@@ -116,12 +126,14 @@ class sale_order(osv.osv):
                 res[r] = 0.0
             else:
                 res[r] = 100.0 * res[r][0] / res[r][1]
-        for order in self.browse(cr, uid, ids, context):
+        for order in self.browse(cr, uid, ids, context=context):
             if order.shipped:
                 res[order.id] = 100.0
         return res
 
     def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
+        if context is None:
+            context = {}
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
             if sale.invoiced:
@@ -139,6 +151,8 @@ class sale_order(osv.osv):
         return res
 
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
+        if context is None:
+            context = {}
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
             res[sale.id] = True
@@ -150,7 +164,9 @@ class sale_order(osv.osv):
                 res[sale.id] = False
         return res
 
-    def _invoiced_search(self, cursor, user, obj, name, args, context):
+    def _invoiced_search(self, cursor, user, obj, name, args, context=None):
+        if context is None:
+            context = {}
         if not len(args):
             return []
         clause = ''
@@ -177,7 +193,9 @@ class sale_order(osv.osv):
             return [('id', '=', 0)]
         return [('id', 'in', [x[0] for x in res])]
 
-    def _get_order(self, cr, uid, ids, context={}):
+    def _get_order(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         result = {}
         for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
             result[line.order_id.id] = True
@@ -277,7 +295,9 @@ class sale_order(osv.osv):
 
     # Form filling
     def unlink(self, cr, uid, ids, context=None):
-        sale_orders = self.read(cr, uid, ids, ['state'])
+        if context is None:
+            context = {}
+        sale_orders = self.read(cr, uid, ids, ['state'], context=context)
         unlink_ids = []
         for s in sale_orders:
             if s['state'] in ['draft', 'cancel']:
@@ -336,7 +356,9 @@ class sale_order(osv.osv):
 
         return {'value': val}
 
-    def shipping_policy_change(self, cr, uid, ids, policy, context={}):
+    def shipping_policy_change(self, cr, uid, ids, policy, context=None):
+        if context is None:
+            context = {}
         if not policy:
             return {}
         inv_qty = 'order'
@@ -347,6 +369,8 @@ class sale_order(osv.osv):
         return {'value': {'invoice_quantity': inv_qty}}
 
     def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
         if 'order_policy' in vals:
             if vals['order_policy'] == 'prepaid':
                 vals.update({'invoice_quantity': 'order'})
@@ -354,7 +378,9 @@ class sale_order(osv.osv):
                 vals.update({'invoice_quantity': 'procurement'})
         return super(sale_order, self).write(cr, uid, ids, vals, context=context)
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
         if 'order_policy' in vals:
             if vals['order_policy'] == 'prepaid':
                 vals.update({'invoice_quantity': 'order'})
@@ -362,17 +388,23 @@ class sale_order(osv.osv):
                 vals.update({'invoice_quantity': 'procurement'})
         return super(sale_order, self).create(cr, uid, vals, context=context)
 
-    def button_dummy(self, cr, uid, ids, context={}):
+    def button_dummy(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         return True
 
     #FIXME: the method should return the list of invoices created (invoice_ids)
     # and not the id of the last invoice created (res). The problem is that we
     # cannot change it directly since the method is called by the sale order
     # workflow and I suppose it expects a single id...
-    def _inv_get(self, cr, uid, order, context={}):
+    def _inv_get(self, cr, uid, order, context=None):
+        if context is None:
+            context = {}
         return {}
 
-    def _make_invoice(self, cr, uid, order, lines, context={}):
+    def _make_invoice(self, cr, uid, order, lines, context=None):
+        if context is None:
+            context = {}
         a = order.partner_id.property_account_receivable.id
         if order.payment_term:
             pay_term = order.payment_term.id
@@ -408,7 +440,7 @@ class sale_order(osv.osv):
         }
         inv_obj = self.pool.get('account.invoice')
         inv.update(self._inv_get(cr, uid, order))
-        inv_id = inv_obj.create(cr, uid, inv, context)
+        inv_id = inv_obj.create(cr, uid, inv, context=context)
         data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], pay_term, time.strftime('%Y-%m-%d'))
         if data.get('value', False):
             inv_obj.write(cr, uid, [inv_id], data['value'], context=context)
@@ -458,8 +490,10 @@ class sale_order(osv.osv):
                     cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (order.id, res))
         return res
 
-    def action_invoice_cancel(self, cr, uid, ids, context={}):
-        for sale in self.browse(cr, uid, ids):
+    def action_invoice_cancel(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        for sale in self.browse(cr, uid, ids, context=context):
             for line in sale.order_line:
                 invoiced = False
                 for iline in line.invoice_lines:
@@ -471,8 +505,10 @@ class sale_order(osv.osv):
         self.write(cr, uid, ids, {'state': 'invoice_except', 'invoice_ids': False})
         return True
 
-    def action_invoice_end(self, cr, uid, ids, context={}):
-        for order in self.browse(cr, uid, ids):
+    def action_invoice_end(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        for order in self.browse(cr, uid, ids, context=context):
             val = {'invoiced': True}
             if order.state == 'invoice_except':
                 val['state'] = 'progress'
@@ -487,10 +523,12 @@ class sale_order(osv.osv):
 
         return True
 
-    def action_cancel(self, cr, uid, ids, context={}):
+    def action_cancel(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         ok = True
         sale_order_line_obj = self.pool.get('sale.order.line')
-        for sale in self.browse(cr, uid, ids):
+        for sale in self.browse(cr, uid, ids, context=context):
             for pick in sale.picking_ids:
                 if pick.state not in ('draft', 'cancel'):
                     raise osv.except_osv(
@@ -687,8 +725,10 @@ class sale_order(osv.osv):
 
         return True
 
-    def action_ship_end(self, cr, uid, ids, context={}):
-        for order in self.browse(cr, uid, ids):
+    def action_ship_end(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        for order in self.browse(cr, uid, ids, context=context):
             val = {'shipped': True}
             if order.state == 'shipping_except':
                 val['state'] = 'progress'
@@ -742,24 +782,30 @@ sale_order()
 # - update it on change product and unit price
 # - use it in report if there is a uos
 class sale_order_line(osv.osv):
-    def _amount_line_net(self, cr, uid, ids, field_name, arg, context):
+    def _amount_line_net(self, cr, uid, ids, field_name, arg, context=None):
+        if context is None:
+            context = {}
         res = {}
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
         return res
 
-    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+    def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
+        if context is None:
+            context = {}
         res = {}
         cur_obj = self.pool.get('res.currency')
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0)
             cur = line.order_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
         return res
 
-    def _number_packages(self, cr, uid, ids, field_name, arg, context):
+    def _number_packages(self, cr, uid, ids, field_name, arg, context=None):
+        if context is None:
+            context = {}
         res = {}
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             try:
                 res[line.id] = int(line.product_uom_qty / line.product_packaging.qty)
             except:
@@ -776,12 +822,12 @@ class sale_order_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
-        'procurement_id': fields.many2one('mrp.procurement', 'Requisition'),
+        'procurement_id': fields.many2one('mrp.procurement', 'Procurement'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
         'price_net': fields.function(_amount_line_net, method=True, string='Net Price', digits_compute= dp.get_precision('Sale Price')),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
-        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Requisition Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft':[('readonly',False)]}),
         'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -817,7 +863,9 @@ class sale_order_line(osv.osv):
         'product_packaging': lambda *a: False
     }
 
-    def invoice_line_create(self, cr, uid, ids, context={}):
+    def invoice_line_create(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         def _get_line_qty(line):
             if (line.order_id.invoice_quantity=='order') or not line.procurement_id:
                 if line.product_uos:
@@ -825,7 +873,7 @@ class sale_order_line(osv.osv):
                 return line.product_uom_qty
             else:
                 return self.pool.get('mrp.procurement').quantity_get(cr, uid,
-                        line.procurement_id.id, context)
+                        line.procurement_id.id, context=context)
 
         def _get_line_uom(line):
             if (line.order_id.invoice_quantity=='order') or not line.procurement_id:
@@ -834,11 +882,11 @@ class sale_order_line(osv.osv):
                 return line.product_uom.id
             else:
                 return self.pool.get('mrp.procurement').uom_get(cr, uid,
-                        line.procurement_id.id, context)
+                        line.procurement_id.id, context=context)
 
         create_ids = []
         sales = {}
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             if not line.invoiced:
                 if line.product_id:
                     a = line.product_id.product_tmpl_id.property_account_income.id
@@ -889,19 +937,25 @@ class sale_order_line(osv.osv):
             wf_service.trg_write(uid, 'sale.order', sid, cr)
         return create_ids
 
-    def button_cancel(self, cr, uid, ids, context={}):
+    def button_cancel(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         for line in self.browse(cr, uid, ids, context=context):
             if line.invoiced:
                 raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sale order line that has already been invoiced !'))
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
-    def button_confirm(self, cr, uid, ids, context={}):
+    def button_confirm(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         return self.write(cr, uid, ids, {'state': 'confirmed'})
 
-    def button_done(self, cr, uid, ids, context={}):
+    def button_done(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         wf_service = netsvc.LocalService("workflow")
         res = self.write(cr, uid, ids, {'state': 'done'})
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             wf_service.trg_write(uid, 'sale.order', line.order_id.id, cr)
 
         return res
@@ -926,11 +980,13 @@ class sale_order_line(osv.osv):
             pass
         return {'value': value}
 
-    def copy_data(self, cr, uid, id, default=None, context={}):
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if context is None:
+            context = {}
         if not default:
             default = {}
         default.update({'state': 'draft', 'move_ids': [], 'invoiced': False, 'invoice_lines': []})
-        return super(sale_order_line, self).copy_data(cr, uid, id, default, context)
+        return super(sale_order_line, self).copy_data(cr, uid, id, default, context=context)
 
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
@@ -961,7 +1017,7 @@ class sale_order_line(osv.osv):
 
         if packaging:
             default_uom = product_obj.uom_id and product_obj.uom_id.id
-            pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context)
+            pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context=context)
             q = product_uom_obj._compute_qty(cr, uid, uom, pack.qty, default_uom)
 #            qty = qty - qty % q + q
             if qty and (q and not (qty % q) == 0):
@@ -1070,7 +1126,9 @@ class sale_order_line(osv.osv):
             res['value']['price_unit'] = 0.0
         return res
 
-    def unlink(self, cr, uid, ids, context={}):
+    def unlink(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         """Allows to delete sale order lines in draft,cancel states"""
         for rec in self.browse(cr, uid, ids, context=context):
             if rec.state not in ['draft', 'cancel']:
@@ -1093,7 +1151,8 @@ class sale_config_picking_policy(osv.osv_memory):
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
-        ], 'Shipping Default Policy', required=True),
+        ], 'Shipping Default Policy', required=True,
+           help="You can generate invoices based on sales orders or based on shippings."),
         'step': fields.selection([
             ('one', 'Delivery Order Only'),
             ('two', 'Picking List & Delivery Order')
@@ -1105,11 +1164,13 @@ class sale_config_picking_policy(osv.osv_memory):
     }
     _defaults = {
         'picking_policy': lambda *a: 'direct',
-        'order_policy': lambda *a: 'picking',
+        'order_policy': lambda *a: 'manual',
         'step': lambda *a: 'one'
     }
 
     def execute(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         for o in self.browse(cr, uid, ids, context=context):
             ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
@@ -1118,13 +1179,13 @@ class sale_config_picking_policy(osv.osv_memory):
             if o.step == 'one':
                 md = self.pool.get('ir.model.data')
                 group_id = md._get_id(cr, uid, 'base', 'group_no_one')
-                group_id = md.browse(cr, uid, group_id, context).res_id
+                group_id = md.browse(cr, uid, group_id, context=context).res_id
                 menu_id = md._get_id(cr, uid, 'stock', 'menu_action_picking_tree_delivery')
-                menu_id = md.browse(cr, uid, menu_id, context).res_id
+                menu_id = md.browse(cr, uid, menu_id, context=context).res_id
                 self.pool.get('ir.ui.menu').write(cr, uid, [menu_id], {'groups_id': [(6, 0, [group_id])]})
 
                 location_id = md._get_id(cr, uid, 'stock', 'stock_location_output')
-                location_id = md.browse(cr, uid, location_id, context).res_id
+                location_id = md.browse(cr, uid, location_id, context=context).res_id
                 self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
 sale_config_picking_policy()
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1e1c3f427ab..156ede282d0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-<!--        <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"-->
-<!--            groups="group_sale_user"/>-->
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
@@ -45,7 +43,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_shop_tree"/>
         </record>
-        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="70"/>
+        <menuitem action="action_shop_form" id="menu_action_shop_form"
+            parent="base.menu_base_config" sequence="70"
+            groups="base.group_extended"/>
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
@@ -76,8 +76,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales orders">
-                    <field name="date_order" string="Order date"/>
-                    <field name="name" string="Reference"/>
+                    <field name="date_order"/>
+                    <field name="name"/>
                     <field name="partner_id"/>
                     <field name="partner_shipping_id"/>
                     <field name="user_id" />
@@ -98,11 +98,11 @@
                 <form string="Sales order">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="client_order_ref" select="2"/>
-                        <field name="shipped" select="2"/>
-                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2" widget="selection"/>
-                        <field name="date_order" select="1" string="Order date" />
-                        <field name="invoiced" select="2"/>
+                        <field name="client_order_ref"/>
+                        <field name="shipped"/>
+                        <field name="date_order" select="1"/>
+                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
+                        <field name="invoiced"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sale Order">
@@ -111,14 +111,14 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
-                            <field name="project_id" select="2"
-                                context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
+                            <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"/>
                             <newline/>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
                                     <notebook>
                                         <page string="Order Line">
-                                            <separator colspan="4" string="Automatic Declaration"/>
                                             <field colspan="4"
                                                 context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
                                                 name="product_id"
@@ -139,18 +139,17 @@
                                                 groups="base.group_extended"/>
 
                                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                            <separator colspan="4" string="Manual Description"/>
-                                            <field colspan="4" name="name" select="2"/>
-                                            <field name="price_unit" select="2"/>
+                                            <field colspan="4" name="name"/>
+                                            <field name="price_unit"/>
                                             <field name="discount"/>
-                                            <field name="type"/>
-                                            <field name="delay" select="2"/>
+                                            <field name="type" groups="base.group_extended"/>
+                                            <field name="delay" groups="base.group_extended"/>
                                             <newline/>
                                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                            <separator colspan="4" string="States"/>
-                                            <field name="state" select="2"/>
-                                            <group col="3" colspan="2">
-                                                <field name="invoiced" select="2"/>
+                                            <group colspan="4" col="5" groups="base.group_extended">
+                                                <separator colspan="5" string="States"/>
+                                                <field name="state"/>
+                                                <field name="invoiced"/>
                                                 <button colspan="1"
                                                     name="%(action_view_sale_order_line_make_invoice)d"
                                                     states="confirmed"
@@ -163,7 +162,7 @@
                                             <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
                                             <field groups="product.group_uos" name="product_uos"/>
                                             <field name="th_weight"/>
-                                            <field name="address_allotment_id" select="2"/>
+                                            <field name="address_allotment_id"/>
                                             <separator colspan="4" string="Properties"/>
                                             <field colspan="4" name="property_ids" nolabel="1"/>
                                         </page>
@@ -196,12 +195,12 @@
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
                             <group col="13" colspan="4">
-                                <field name="state" select="2"/>
+                                <field name="state"/>
                                 <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-print"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
-                                <button name="ship_recreate" states="shipping_except" string="Recreate Requisition" icon="gtk-ok"/>
-                                <button name="ship_corrected" states="shipping_except" string="Requisition Corrected" icon="gtk-apply"/>
+                                <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
+                                <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
                                 <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-print"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
@@ -211,25 +210,25 @@
                             </group>
                         </page>
                         <page string="Other data">
-                            <group colspan="2" col="2">
+                            <group colspan="2" col="2" groups="base.group_extended" name="logistic">
                                 <separator string="Logistic" colspan="2"/>
-                                <field groups="base.group_extended" name="incoterm"/>
-                                <field groups="base.group_extended" name="picking_policy" required="True"/>
+                                <field name="incoterm"/>
+                                <field name="picking_policy" required="True"/>
                                 <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
-                                <field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
+                                <field name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="References" colspan="2"/>
                                 <field name="user_id"/>
                                 <field groups="base.group_extended" name="origin"/>
                             </group>
-                            <group colspan="2" col="2">
+                            <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Conditions" colspan="2"/>
                                 <field name="payment_term" widget="selection"/>
-                                <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="fiscal_position" widget="selection"/>
+                                <field name="company_id" widget="selection"/>
                             </group>
-                            <group colspan="2" col="2">
+                            <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Dates" colspan="2"/>
                                 <field name="create_date" widget="datetime"/>
                                 <field name="date_confirm"/>
@@ -237,7 +236,7 @@
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string="History">
+                        <page string="History" groups="base.group_extended">
                             <separator colspan="4" string="Related invoices"/>
                             <field colspan="4" name="invoice_ids" nolabel="1"/>
                             <field colspan="4" name="picking_ids" nolabel="1"/>
@@ -260,7 +259,7 @@
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
                     <field name="user_id" select="1" widget="selection">
-                        <filter icon="terp-partner" string="My Sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
+                        <filter icon="terp-partner" name="my_sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
                     </field>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
@@ -280,7 +279,7 @@
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="context">{"search_default_My Sale":1}</field>
+            <field name="context">{"search_default_my_sale":1}</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
@@ -351,8 +350,7 @@
                     <field name="product_id"/>
                     <field name="product_uom_qty" string="Qty"/>
                     <field name="product_uom" string="UoM"/>
-                    <field name="discount"/>
-                    <field name="price_unit"/>
+                    <field name="salesman_id"/>
                     <field name="price_net"/>
                     <field name="price_subtotal"/>
                     <field name="th_weight"/>
@@ -368,43 +366,43 @@
                 <form string="Sales Order Lines">
                     <notebook>
                         <page string="Order Lines">
-                            <separator colspan="4" string="Automatic Declaration"/>
+                            <separator colspan="4" string="General Information"/>
                             <field name="order_id" select="1"/>
                             <field name="order_partner_id" readonly="1" select="1" invisible="1"/>
-                            <field name="product_uom_qty" readonly="1" select="2"/>
+                            <field name="product_uom_qty" readonly="1"/>
                             <field name="product_uom"/>
                             <field name="product_id" readonly="1" select="1"/>
-                            <field name="invoiced" select="2"/>
+                            <field name="invoiced"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <separator colspan="4" string="Manual Designation"/>
-                            <field colspan="4" name="name" select="2"/>
-                            <field name="price_unit" select="2"/>
+                            <field colspan="4" name="name"/>
+                            <field name="price_unit"/>
                             <field name="discount"/>
-                            <field name="type"/>
-                            <field name="delay" select="2"/>
+                            <field name="type" groups="base.group_extended"/>
+                            <field name="delay" groups="base.group_extended"/>
                             <field name="price_subtotal"/>
                             <field name="th_weight"/>
                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                             <separator colspan="4" string="States"/>
-                            <field name="state" select="2"/>
+                            <field name="state"/>
                             <group col="2" colspan="2">
                                 <button name="button_done"
-                                	states="confirmed,exception"
-                                	string="Done" type="object"
-                                	icon="gtk-jump-to" />
+                                    states="confirmed,exception"
+                                    string="Done" type="object"
+                                    icon="gtk-jump-to" />
                                 <button name="button_cancel"
-                                	states="confirmed,exception"
-                                	string="Cancel" type="object"
-                                	icon="gtk-cancel" />
+                                    states="confirmed,exception"
+                                    string="Cancel" type="object"
+                                    icon="gtk-cancel" />
                             </group>
                         </page>
-                        <page string="Properties">
+                        <page string="Properties" groups="base.group_extended">
                             <field name="property_ids" nolabel="1"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
-                        <page string="Invoice Lines">
+                        <page string="Invoice Lines" groups="base.group_extended">
                             <field colspan="4" name="invoice_lines" nolabel="1"/>
                         </page>
                     </notebook>
@@ -431,6 +429,7 @@
                     <group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
                         <filter string="Product" icon="terp-sale"  domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
+                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'salesman_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
@@ -446,8 +445,9 @@
                     <group>
                     <filter icon="terp-purchase" string="Shipped"
                         domain="[('state','=','done')]"
+                        name="unshipped"
                         separator="1" />
-                    <filter icon="terp-purchase" string="Uninvoiced"
+                    <filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
                         separator="1" />
                     <separator orientation="vertical"/>
@@ -467,12 +467,12 @@
         </record>
 
         <record id="action_order_line_tree2" model="ir.actions.act_window">
-            <field name="name">Uninvoiced Lines</field>
+            <field name="name">Lines to Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{"search_default_Uninvoiced":1}</field>
+            <field name="context">{"search_default_uninvoiced":1,"search_default_unshipped":1}</field>
             <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
             <field name="filter" eval="True"/>
         </record>
@@ -491,7 +491,7 @@
 
         <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
 
-        <menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="6"/>
+        <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="6"/>
         <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
         <!-- configartion view -->
 
@@ -507,11 +507,11 @@
                 </form>
                 <group string="res_config_contents" position="replace">
                   <label colspan="4" align="0.0"
-                         string="Set the policies selected by default when creating a new sale order."/>
+                         string="Setup your sales workflow and default values."/>
                   <separator colspan="4"
                        string="Configure Sale Order Logistic"/>
                   <newline/>
-                  <field name="picking_policy"/>
+                  <field name="picking_policy" groups="base.group_extended"/>
                   <newline/>
                   <field name="order_policy"/>
                   <newline/>
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index db273c38b60..2e9e7e0b66e 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -12,6 +12,5 @@
                 </field>
             </field>
         </record>
-        
     </data>
 </openerp>
diff --git a/addons/sale_analytic_plans/__terp__.py b/addons/sale_analytic_plans/__openerp__.py
similarity index 100%
rename from addons/sale_analytic_plans/__terp__.py
rename to addons/sale_analytic_plans/__openerp__.py
diff --git a/addons/sale_analytic_plans/i18n/ar.po b/addons/sale_analytic_plans/i18n/ar.po
index 0724671a539..41461144eb7 100644
--- a/addons/sale_analytic_plans/i18n/ar.po
+++ b/addons/sale_analytic_plans/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/bg.po b/addons/sale_analytic_plans/i18n/bg.po
index 5f32a57264e..1b6b16546a2 100644
--- a/addons/sale_analytic_plans/i18n/bg.po
+++ b/addons/sale_analytic_plans/i18n/bg.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-10-24 19:48+0000\n"
+"PO-Revision-Date: 2010-04-17 16:49+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Аналитично рапределение"
 
 #. module: sale_analytic_plans
 #: constraint:ir.ui.view:0
@@ -29,4 +29,4 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr ""
+msgstr "Аналитично разпределение на продажби"
diff --git a/addons/sale_analytic_plans/i18n/bs.po b/addons/sale_analytic_plans/i18n/bs.po
index f66c5fbe9a4..967062dfbe6 100644
--- a/addons/sale_analytic_plans/i18n/bs.po
+++ b/addons/sale_analytic_plans/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ca.po b/addons/sale_analytic_plans/i18n/ca.po
index 7af361ae6d3..d4931e817a6 100644
--- a/addons/sale_analytic_plans/i18n/ca.po
+++ b/addons/sale_analytic_plans/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/cs.po b/addons/sale_analytic_plans/i18n/cs.po
index 5411f463d68..1861fcaf020 100644
--- a/addons/sale_analytic_plans/i18n/cs.po
+++ b/addons/sale_analytic_plans/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/da.po b/addons/sale_analytic_plans/i18n/da.po
index d50e5690511..54630e28e4a 100644
--- a/addons/sale_analytic_plans/i18n/da.po
+++ b/addons/sale_analytic_plans/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/de.po b/addons/sale_analytic_plans/i18n/de.po
index 8964366313f..a3ffff8b966 100644
--- a/addons/sale_analytic_plans/i18n/de.po
+++ b/addons/sale_analytic_plans/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/el.po b/addons/sale_analytic_plans/i18n/el.po
index 4c0f767c790..6bd4affebea 100644
--- a/addons/sale_analytic_plans/i18n/el.po
+++ b/addons/sale_analytic_plans/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/sale_analytic_plans/i18n/es.po b/addons/sale_analytic_plans/i18n/es.po
index 30ed0f7e63a..2d0e261b419 100644
--- a/addons/sale_analytic_plans/i18n/es.po
+++ b/addons/sale_analytic_plans/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/es_AR.po b/addons/sale_analytic_plans/i18n/es_AR.po
index c308d071031..fc69a519476 100644
--- a/addons/sale_analytic_plans/i18n/es_AR.po
+++ b/addons/sale_analytic_plans/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/et.po b/addons/sale_analytic_plans/i18n/et.po
index a5c565e4144..685d7aabedd 100644
--- a/addons/sale_analytic_plans/i18n/et.po
+++ b/addons/sale_analytic_plans/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/fr.po b/addons/sale_analytic_plans/i18n/fr.po
index e8409fa1a38..ad3ceb15631 100644
--- a/addons/sale_analytic_plans/i18n/fr.po
+++ b/addons/sale_analytic_plans/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/gl.po b/addons/sale_analytic_plans/i18n/gl.po
index b1268f52869..f28a97cfd2e 100644
--- a/addons/sale_analytic_plans/i18n/gl.po
+++ b/addons/sale_analytic_plans/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/hr.po b/addons/sale_analytic_plans/i18n/hr.po
index a2210391f9c..bb8e5ce61b3 100644
--- a/addons/sale_analytic_plans/i18n/hr.po
+++ b/addons/sale_analytic_plans/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/sale_analytic_plans/i18n/hu.po b/addons/sale_analytic_plans/i18n/hu.po
index 0724671a539..41461144eb7 100644
--- a/addons/sale_analytic_plans/i18n/hu.po
+++ b/addons/sale_analytic_plans/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/id.po b/addons/sale_analytic_plans/i18n/id.po
index 7aa182169ca..1c35537455e 100644
--- a/addons/sale_analytic_plans/i18n/id.po
+++ b/addons/sale_analytic_plans/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/it.po b/addons/sale_analytic_plans/i18n/it.po
index aee0e90d0a5..af20b461f7f 100644
--- a/addons/sale_analytic_plans/i18n/it.po
+++ b/addons/sale_analytic_plans/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ko.po b/addons/sale_analytic_plans/i18n/ko.po
index d3b6ee5b27d..1a08f586eca 100644
--- a/addons/sale_analytic_plans/i18n/ko.po
+++ b/addons/sale_analytic_plans/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/lt.po b/addons/sale_analytic_plans/i18n/lt.po
index 0724671a539..41461144eb7 100644
--- a/addons/sale_analytic_plans/i18n/lt.po
+++ b/addons/sale_analytic_plans/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/nl.po b/addons/sale_analytic_plans/i18n/nl.po
index e3c90aae0bb..54095e71f85 100644
--- a/addons/sale_analytic_plans/i18n/nl.po
+++ b/addons/sale_analytic_plans/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/nl_BE.po b/addons/sale_analytic_plans/i18n/nl_BE.po
index 6ee7d711e41..b11c2c5a12d 100644
--- a/addons/sale_analytic_plans/i18n/nl_BE.po
+++ b/addons/sale_analytic_plans/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/pl.po b/addons/sale_analytic_plans/i18n/pl.po
index b490b1c7556..937b2c9a29b 100644
--- a/addons/sale_analytic_plans/i18n/pl.po
+++ b/addons/sale_analytic_plans/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/pt.po b/addons/sale_analytic_plans/i18n/pt.po
index 930b92b16ab..169dc85ea3c 100644
--- a/addons/sale_analytic_plans/i18n/pt.po
+++ b/addons/sale_analytic_plans/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/pt_BR.po b/addons/sale_analytic_plans/i18n/pt_BR.po
index d3bd04e03dc..d43c1081041 100644
--- a/addons/sale_analytic_plans/i18n/pt_BR.po
+++ b/addons/sale_analytic_plans/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ro.po b/addons/sale_analytic_plans/i18n/ro.po
index ab34c273ed5..76f29c36534 100644
--- a/addons/sale_analytic_plans/i18n/ro.po
+++ b/addons/sale_analytic_plans/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po
index 659f7d5886b..675745b08d6 100644
--- a/addons/sale_analytic_plans/i18n/ru.po
+++ b/addons/sale_analytic_plans/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sk.po b/addons/sale_analytic_plans/i18n/sk.po
index 9663659edd3..e59b31016bb 100644
--- a/addons/sale_analytic_plans/i18n/sk.po
+++ b/addons/sale_analytic_plans/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sl.po b/addons/sale_analytic_plans/i18n/sl.po
index 42eb05b61ab..8d64a0c9077 100644
--- a/addons/sale_analytic_plans/i18n/sl.po
+++ b/addons/sale_analytic_plans/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/sv.po b/addons/sale_analytic_plans/i18n/sv.po
index 2aff095c8d8..9e4f16ab3ed 100644
--- a/addons/sale_analytic_plans/i18n/sv.po
+++ b/addons/sale_analytic_plans/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/tlh.po b/addons/sale_analytic_plans/i18n/tlh.po
index 40ee3b963da..5a2dd2c8091 100644
--- a/addons/sale_analytic_plans/i18n/tlh.po
+++ b/addons/sale_analytic_plans/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/tr.po b/addons/sale_analytic_plans/i18n/tr.po
index 49660a04c35..f10c5e3e37f 100644
--- a/addons/sale_analytic_plans/i18n/tr.po
+++ b/addons/sale_analytic_plans/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/uk.po b/addons/sale_analytic_plans/i18n/uk.po
index 68e93133752..13e4f4a15d0 100644
--- a/addons/sale_analytic_plans/i18n/uk.po
+++ b/addons/sale_analytic_plans/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/zh_CN.po b/addons/sale_analytic_plans/i18n/zh_CN.po
index 5fe6ef70cfb..0c64f7afdc6 100644
--- a/addons/sale_analytic_plans/i18n/zh_CN.po
+++ b/addons/sale_analytic_plans/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/zh_TW.po b/addons/sale_analytic_plans/i18n/zh_TW.po
index e2ea53af282..394d874ab49 100644
--- a/addons/sale_analytic_plans/i18n/zh_TW.po
+++ b/addons/sale_analytic_plans/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 0fe67b5ff22..5769cd18f2f 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -2,39 +2,39 @@
 <openerp>
 <data>
 
-	<record model="ir.ui.view" id="view_order_form_inherit">
-		<field name="name">sale.order.form.inherit</field>
-		<field name="model">sale.order</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="sale.view_order_form"/>
-		<field name="arch" type="xml">
-			<field name="project_id" select="2" position="replace"/>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_order_form_inherit">
+        <field name="name">sale.order.form.inherit</field>
+        <field name="model">sale.order</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <field name="project_id" position="replace"/>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_order_form_inherit2">
-		<field name="name">sale.order.form.inherit2</field>
-		<field name="model">sale.order</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="sale.view_order_form"/>
-		<field name="arch" type="xml">
-			<field name="product_id" position="after">
-				<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_order_form_inherit2">
+        <field name="name">sale.order.form.inherit2</field>
+        <field name="model">sale.order</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <field name="product_id" position="after">
+                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+            </field>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_order_line_form2_inherit">
-		<field name="name">sale.order.line.form2.inherit</field>
-		<field name="model">sale.order.line</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="sale.view_order_line_form2"/>
-		<field name="arch" type="xml">
-			<field name="product_id" readonly="1" select="1" position="after">
-				<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
-			</field>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_order_line_form2_inherit">
+        <field name="name">sale.order.line.form2.inherit</field>
+        <field name="model">sale.order.line</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="sale.view_order_line_form2"/>
+        <field name="arch" type="xml">
+            <field name="product_id" readonly="1" select="1" position="after">
+                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+            </field>
+        </field>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/sale_crm/__terp__.py b/addons/sale_crm/__openerp__.py
similarity index 100%
rename from addons/sale_crm/__terp__.py
rename to addons/sale_crm/__openerp__.py
diff --git a/addons/sale_crm/i18n/ar.po b/addons/sale_crm/i18n/ar.po
index 8d92711b395..8e6a02bdad7 100644
--- a/addons/sale_crm/i18n/ar.po
+++ b/addons/sale_crm/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/bg.po b/addons/sale_crm/i18n/bg.po
index a06d43e3246..0f64328c0e4 100644
--- a/addons/sale_crm/i18n/bg.po
+++ b/addons/sale_crm/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-29 11:58+0000\n"
+"PO-Revision-Date: 2010-04-17 16:22+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@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-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -29,7 +29,7 @@ msgstr "Анализ потенциални възможности"
 #. module: sale_crm
 #: help:crm.case.make_order,init,partner_id:0
 msgid "Use this partner if there is no partner on the case"
-msgstr ""
+msgstr "Използвай този партньор, ако няма друг партньор по случая"
 
 #. module: sale_crm
 #: wizard_button:sale_crm.make_case,init,create:0
@@ -49,7 +49,7 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
 msgid "Opportunity goes into the quotation"
-msgstr ""
+msgstr "Превръщане на потенциална възможност в оферта"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractanalytic0
@@ -79,7 +79,7 @@ msgstr "Изготви оферта"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractpricelist0
 msgid "Contract Volume (pricelist)"
-msgstr ""
+msgstr "Договорен обем (ценови списък)"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmopportunity0
@@ -104,7 +104,7 @@ msgstr "Директна доставка"
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity Quotation"
-msgstr ""
+msgstr "Потенциална оферта"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmquotation0
@@ -132,7 +132,7 @@ msgstr "Клиент"
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
 msgid "Opporunity convert to the Pricelist"
-msgstr ""
+msgstr "Превръщане на потенциална възможност в ценови списък"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,user:0
@@ -142,7 +142,7 @@ msgstr "Отговорности на потребителя"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractanalytic0
 msgid "Reflect the contract made with customer"
-msgstr ""
+msgstr "Отрази сключения договор с клиента"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,products:0
@@ -173,12 +173,12 @@ msgstr "CRM потенциалната възможност може да дов
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
 msgid "Opportunity Pricelist"
-msgstr ""
+msgstr "Ценова листа за потенциална възможност"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractpricelist0
 msgid "Contract Pricelist"
-msgstr ""
+msgstr "Ценови списък по договор"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,name:0
@@ -205,4 +205,4 @@ msgstr "Отказ"
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,section:0
 msgid "Case Section"
-msgstr ""
+msgstr "Секция Случаи"
diff --git a/addons/sale_crm/i18n/bs.po b/addons/sale_crm/i18n/bs.po
index f5ffe81d0f2..e30eb19953a 100644
--- a/addons/sale_crm/i18n/bs.po
+++ b/addons/sale_crm/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/ca.po b/addons/sale_crm/i18n/ca.po
index 95843817029..dc4d3ef6aae 100644
--- a/addons/sale_crm/i18n/ca.po
+++ b/addons/sale_crm/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/cs.po b/addons/sale_crm/i18n/cs.po
index 8d92711b395..8e6a02bdad7 100644
--- a/addons/sale_crm/i18n/cs.po
+++ b/addons/sale_crm/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/de.po b/addons/sale_crm/i18n/de.po
index 2738ff50361..5c8c5c37cc4 100644
--- a/addons/sale_crm/i18n/de.po
+++ b/addons/sale_crm/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/el.po b/addons/sale_crm/i18n/el.po
index 784614e9a7e..7d8dd462057 100644
--- a/addons/sale_crm/i18n/el.po
+++ b/addons/sale_crm/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index 3e9cd9adeed..3c2c1a9bf16 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/es_AR.po b/addons/sale_crm/i18n/es_AR.po
index 103e5ec5265..7c2642a6370 100644
--- a/addons/sale_crm/i18n/es_AR.po
+++ b/addons/sale_crm/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/et.po b/addons/sale_crm/i18n/et.po
index 4095f636b24..193c44f768c 100644
--- a/addons/sale_crm/i18n/et.po
+++ b/addons/sale_crm/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/fr.po b/addons/sale_crm/i18n/fr.po
index 1ac6d8527ed..07349d3af12 100644
--- a/addons/sale_crm/i18n/fr.po
+++ b/addons/sale_crm/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index b79b621c0ab..5ab251827fc 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/sale_crm/i18n/hu.po b/addons/sale_crm/i18n/hu.po
index 8d92711b395..8e6a02bdad7 100644
--- a/addons/sale_crm/i18n/hu.po
+++ b/addons/sale_crm/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/id.po b/addons/sale_crm/i18n/id.po
index c19ddc760f2..b15599dc331 100644
--- a/addons/sale_crm/i18n/id.po
+++ b/addons/sale_crm/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 823cb8eb8e4..ed3269aac0d 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/ko.po b/addons/sale_crm/i18n/ko.po
index 93b8e6b4cab..b854c556d05 100644
--- a/addons/sale_crm/i18n/ko.po
+++ b/addons/sale_crm/i18n/ko.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: 2009-09-08 16:15+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-04-15 01:00+0000\n"
+"Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -45,7 +45,7 @@ msgstr "한꺼번"
 #. module: sale_crm
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
diff --git a/addons/sale_crm/i18n/lt.po b/addons/sale_crm/i18n/lt.po
index bb7015ccfa2..46cc029227b 100644
--- a/addons/sale_crm/i18n/lt.po
+++ b/addons/sale_crm/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/nl.po b/addons/sale_crm/i18n/nl.po
index aa931fa0039..27aa1e900e7 100644
--- a/addons/sale_crm/i18n/nl.po
+++ b/addons/sale_crm/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/nl_BE.po b/addons/sale_crm/i18n/nl_BE.po
index f282b7aa839..e224d88b31f 100644
--- a/addons/sale_crm/i18n/nl_BE.po
+++ b/addons/sale_crm/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/pl.po b/addons/sale_crm/i18n/pl.po
index d9b4739f199..c90f43226df 100644
--- a/addons/sale_crm/i18n/pl.po
+++ b/addons/sale_crm/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/pt.po b/addons/sale_crm/i18n/pt.po
index 45313da4f89..f3e417d9d96 100644
--- a/addons/sale_crm/i18n/pt.po
+++ b/addons/sale_crm/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index 45c7e1235b4..29dbfebd142 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/ro.po b/addons/sale_crm/i18n/ro.po
index ba7b939d9b7..f373c147701 100644
--- a/addons/sale_crm/i18n/ro.po
+++ b/addons/sale_crm/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index 11315876a7a..83d323548d5 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/sl.po b/addons/sale_crm/i18n/sl.po
index b8172bf958f..cfe1a33eb36 100644
--- a/addons/sale_crm/i18n/sl.po
+++ b/addons/sale_crm/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/sv.po b/addons/sale_crm/i18n/sv.po
index 2155f5d0ce3..30cf5b8f156 100644
--- a/addons/sale_crm/i18n/sv.po
+++ b/addons/sale_crm/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/tlh.po b/addons/sale_crm/i18n/tlh.po
index 3d9ec366d22..887f71803a9 100644
--- a/addons/sale_crm/i18n/tlh.po
+++ b/addons/sale_crm/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index 49b4fe6d64c..f1cb2cd4f1a 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/uk.po b/addons/sale_crm/i18n/uk.po
index 64781d06de4..bd6f18e4900 100644
--- a/addons/sale_crm/i18n/uk.po
+++ b/addons/sale_crm/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index a6cb575cca4..8b344284cf0 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/zh_TW.po b/addons/sale_crm/i18n/zh_TW.po
index 99a1701c953..8e50cb2bb2e 100644
--- a/addons/sale_crm/i18n/zh_TW.po
+++ b/addons/sale_crm/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 6402ecc1450..24912052190 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -8,10 +8,10 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
-            <xpath expr="/form[@string='Opportunities']/group/button[@string='Schedule Call']" position="after">
+            <field name="priority" position="after">
                 <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>
-                <label colspan="6"  string=""/>
-            </xpath>           
+                <label colspan="2"  string=""/>
+            </field>
         </field>
     </record>
 
@@ -22,7 +22,7 @@
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
             <field name="user_id" position="after">
-                <field name="section_id" widget="selection"/>
+                <field name="section_id" widget="selection" groups="base.group_extended"/>
             </field>
         </field>
     </record>
@@ -37,6 +37,7 @@
                 <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
                     <filter icon="terp-crm"
                             domain="[('section_id','=',context.get('section_id',False))]"
+                            groups="base.group_extended"
                             help="My section"/>
                 </field>
             </field>
diff --git a/addons/sale_delivery_report/__terp__.py b/addons/sale_delivery_report/__openerp__.py
similarity index 100%
rename from addons/sale_delivery_report/__terp__.py
rename to addons/sale_delivery_report/__openerp__.py
diff --git a/addons/sale_delivery_report/i18n/ar.po b/addons/sale_delivery_report/i18n/ar.po
index 238fefe295f..bf2f71cabe2 100644
--- a/addons/sale_delivery_report/i18n/ar.po
+++ b/addons/sale_delivery_report/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/bg.po b/addons/sale_delivery_report/i18n/bg.po
index 075d2c8a4e2..75696be70d6 100644
--- a/addons/sale_delivery_report/i18n/bg.po
+++ b/addons/sale_delivery_report/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/bs.po b/addons/sale_delivery_report/i18n/bs.po
index 238fefe295f..bf2f71cabe2 100644
--- a/addons/sale_delivery_report/i18n/bs.po
+++ b/addons/sale_delivery_report/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/ca.po b/addons/sale_delivery_report/i18n/ca.po
index 2b7216fefd3..fcc414a1d95 100644
--- a/addons/sale_delivery_report/i18n/ca.po
+++ b/addons/sale_delivery_report/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/cs.po b/addons/sale_delivery_report/i18n/cs.po
index 238fefe295f..19134724dd1 100644
--- a/addons/sale_delivery_report/i18n/cs.po
+++ b/addons/sale_delivery_report/i18n/cs.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum objednávky"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -29,49 +29,49 @@ msgstr ""
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Weight"
-msgstr ""
+msgstr "Hmotnost"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Designation"
-msgstr ""
+msgstr "Označení"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Stav dodávky:"
 
 #. module: sale_delivery_report
 #: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
 msgid "Delivery order"
-msgstr ""
+msgstr "Stav dodávky"
 
 #. module: sale_delivery_report
 #: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
 msgid "Print Delivery Order"
-msgstr ""
+msgstr "Vytisknout stav dodávky"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Carrier"
-msgstr ""
+msgstr "Nosič"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Invoiced to"
-msgstr ""
+msgstr "Fakturovány"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Lot"
-msgstr ""
+msgstr "Nmožství"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Shipping Date"
-msgstr ""
+msgstr "Datum odeslání"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Quantity"
-msgstr ""
+msgstr "Množství"
diff --git a/addons/sale_delivery_report/i18n/da.po b/addons/sale_delivery_report/i18n/da.po
index b7c2ea0fcf6..0b5ba61fe98 100644
--- a/addons/sale_delivery_report/i18n/da.po
+++ b/addons/sale_delivery_report/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/de.po b/addons/sale_delivery_report/i18n/de.po
index 78bee143da3..1a10f7e997c 100644
--- a/addons/sale_delivery_report/i18n/de.po
+++ b/addons/sale_delivery_report/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/el.po b/addons/sale_delivery_report/i18n/el.po
index fa98419d0a1..15d8cfe6cbc 100644
--- a/addons/sale_delivery_report/i18n/el.po
+++ b/addons/sale_delivery_report/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/sale_delivery_report/i18n/es.po b/addons/sale_delivery_report/i18n/es.po
index 146779a9529..cd8bcc2447d 100644
--- a/addons/sale_delivery_report/i18n/es.po
+++ b/addons/sale_delivery_report/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/es_AR.po b/addons/sale_delivery_report/i18n/es_AR.po
index 46d1ccc7063..40c3aac6ae3 100644
--- a/addons/sale_delivery_report/i18n/es_AR.po
+++ b/addons/sale_delivery_report/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/et.po b/addons/sale_delivery_report/i18n/et.po
index 868949ff283..ea0e4e82506 100644
--- a/addons/sale_delivery_report/i18n/et.po
+++ b/addons/sale_delivery_report/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/fr.po b/addons/sale_delivery_report/i18n/fr.po
index e639b683dfa..751f2cb21e4 100644
--- a/addons/sale_delivery_report/i18n/fr.po
+++ b/addons/sale_delivery_report/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/hr.po b/addons/sale_delivery_report/i18n/hr.po
index 3d382810871..12904213624 100644
--- a/addons/sale_delivery_report/i18n/hr.po
+++ b/addons/sale_delivery_report/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/hu.po b/addons/sale_delivery_report/i18n/hu.po
index 238fefe295f..bf2f71cabe2 100644
--- a/addons/sale_delivery_report/i18n/hu.po
+++ b/addons/sale_delivery_report/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/id.po b/addons/sale_delivery_report/i18n/id.po
index 1e813038f19..d8bdcd19a32 100644
--- a/addons/sale_delivery_report/i18n/id.po
+++ b/addons/sale_delivery_report/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/it.po b/addons/sale_delivery_report/i18n/it.po
index a1b9d1bf6d0..286a1a63160 100644
--- a/addons/sale_delivery_report/i18n/it.po
+++ b/addons/sale_delivery_report/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/ko.po b/addons/sale_delivery_report/i18n/ko.po
index a6afd7f7053..ba47300216a 100644
--- a/addons/sale_delivery_report/i18n/ko.po
+++ b/addons/sale_delivery_report/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/lt.po b/addons/sale_delivery_report/i18n/lt.po
index 238fefe295f..bf2f71cabe2 100644
--- a/addons/sale_delivery_report/i18n/lt.po
+++ b/addons/sale_delivery_report/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/nl.po b/addons/sale_delivery_report/i18n/nl.po
index fbe69bf4354..24d20d44180 100644
--- a/addons/sale_delivery_report/i18n/nl.po
+++ b/addons/sale_delivery_report/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/nl_BE.po b/addons/sale_delivery_report/i18n/nl_BE.po
index 7826dcb456c..236d13e2f51 100644
--- a/addons/sale_delivery_report/i18n/nl_BE.po
+++ b/addons/sale_delivery_report/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/pl.po b/addons/sale_delivery_report/i18n/pl.po
index be1b141f915..a16e6c1b2b2 100644
--- a/addons/sale_delivery_report/i18n/pl.po
+++ b/addons/sale_delivery_report/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/pt.po b/addons/sale_delivery_report/i18n/pt.po
index 4d9709359e9..a73643c57e9 100644
--- a/addons/sale_delivery_report/i18n/pt.po
+++ b/addons/sale_delivery_report/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/pt_BR.po b/addons/sale_delivery_report/i18n/pt_BR.po
index d54f216710e..accafcc6eec 100644
--- a/addons/sale_delivery_report/i18n/pt_BR.po
+++ b/addons/sale_delivery_report/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/ro.po b/addons/sale_delivery_report/i18n/ro.po
index fa35b07a1c9..ad0c81d0c97 100644
--- a/addons/sale_delivery_report/i18n/ro.po
+++ b/addons/sale_delivery_report/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/ru.po b/addons/sale_delivery_report/i18n/ru.po
index d64f24a48dc..445b9176eaa 100644
--- a/addons/sale_delivery_report/i18n/ru.po
+++ b/addons/sale_delivery_report/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/sl.po b/addons/sale_delivery_report/i18n/sl.po
index 11a8d8f90d9..f546215a235 100644
--- a/addons/sale_delivery_report/i18n/sl.po
+++ b/addons/sale_delivery_report/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/sv.po b/addons/sale_delivery_report/i18n/sv.po
index e3b1bed55a7..1e089dd915e 100644
--- a/addons/sale_delivery_report/i18n/sv.po
+++ b/addons/sale_delivery_report/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/tlh.po b/addons/sale_delivery_report/i18n/tlh.po
index d7c3029a405..4f9179dae47 100644
--- a/addons/sale_delivery_report/i18n/tlh.po
+++ b/addons/sale_delivery_report/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/tr.po b/addons/sale_delivery_report/i18n/tr.po
index 605f6ffa884..3ee3d2c8a00 100644
--- a/addons/sale_delivery_report/i18n/tr.po
+++ b/addons/sale_delivery_report/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/uk.po b/addons/sale_delivery_report/i18n/uk.po
index 8ea3d7f7eac..31e22c9e02d 100644
--- a/addons/sale_delivery_report/i18n/uk.po
+++ b/addons/sale_delivery_report/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/zh_CN.po b/addons/sale_delivery_report/i18n/zh_CN.po
index 96b3ed18af0..2497b32a21b 100644
--- a/addons/sale_delivery_report/i18n/zh_CN.po
+++ b/addons/sale_delivery_report/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_delivery_report/i18n/zh_TW.po b/addons/sale_delivery_report/i18n/zh_TW.po
index 2c6ebced747..7de2214d11b 100644
--- a/addons/sale_delivery_report/i18n/zh_TW.po
+++ b/addons/sale_delivery_report/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
diff --git a/addons/sale_journal/__terp__.py b/addons/sale_journal/__openerp__.py
similarity index 100%
rename from addons/sale_journal/__terp__.py
rename to addons/sale_journal/__openerp__.py
diff --git a/addons/sale_journal/i18n/ar.po b/addons/sale_journal/i18n/ar.po
index 01957ee71bc..00962f514b9 100644
--- a/addons/sale_journal/i18n/ar.po
+++ b/addons/sale_journal/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/bg.po b/addons/sale_journal/i18n/bg.po
index 7d1feb36164..def77554435 100644
--- a/addons/sale_journal/i18n/bg.po
+++ b/addons/sale_journal/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/bs.po b/addons/sale_journal/i18n/bs.po
index 5c5c349444e..845f2f6622b 100644
--- a/addons/sale_journal/i18n/bs.po
+++ b/addons/sale_journal/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/ca.po b/addons/sale_journal/i18n/ca.po
index 26b28934d9c..c6b597f71e2 100644
--- a/addons/sale_journal/i18n/ca.po
+++ b/addons/sale_journal/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/cs.po b/addons/sale_journal/i18n/cs.po
index 01957ee71bc..00962f514b9 100644
--- a/addons/sale_journal/i18n/cs.po
+++ b/addons/sale_journal/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/de.po b/addons/sale_journal/i18n/de.po
index 42e526a1596..68ca2668d17 100644
--- a/addons/sale_journal/i18n/de.po
+++ b/addons/sale_journal/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index d6b498b2bdd..0213ac61be1 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/es_AR.po b/addons/sale_journal/i18n/es_AR.po
index 2d2b76c19da..e7db12a10a7 100644
--- a/addons/sale_journal/i18n/es_AR.po
+++ b/addons/sale_journal/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/et.po b/addons/sale_journal/i18n/et.po
index f719ee9c079..5130cdc606a 100644
--- a/addons/sale_journal/i18n/et.po
+++ b/addons/sale_journal/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/fr.po b/addons/sale_journal/i18n/fr.po
index a71c2f49b14..24070d28052 100644
--- a/addons/sale_journal/i18n/fr.po
+++ b/addons/sale_journal/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index d0f169efba7..87f36a5ca04 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/sale_journal/i18n/hu.po b/addons/sale_journal/i18n/hu.po
index 01957ee71bc..00962f514b9 100644
--- a/addons/sale_journal/i18n/hu.po
+++ b/addons/sale_journal/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/id.po b/addons/sale_journal/i18n/id.po
index bad29dcc5b8..8527174cc3b 100644
--- a/addons/sale_journal/i18n/id.po
+++ b/addons/sale_journal/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/it.po b/addons/sale_journal/i18n/it.po
index abb7d4a66c6..53abac37a31 100644
--- a/addons/sale_journal/i18n/it.po
+++ b/addons/sale_journal/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/ko.po b/addons/sale_journal/i18n/ko.po
index 1020ceb50c7..5895ef9c203 100644
--- a/addons/sale_journal/i18n/ko.po
+++ b/addons/sale_journal/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/lt.po b/addons/sale_journal/i18n/lt.po
index 01957ee71bc..00962f514b9 100644
--- a/addons/sale_journal/i18n/lt.po
+++ b/addons/sale_journal/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/nl.po b/addons/sale_journal/i18n/nl.po
index f4e848f65e0..a8326e9d99b 100644
--- a/addons/sale_journal/i18n/nl.po
+++ b/addons/sale_journal/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/nl_BE.po b/addons/sale_journal/i18n/nl_BE.po
index ce186e166a4..2129f2704f3 100644
--- a/addons/sale_journal/i18n/nl_BE.po
+++ b/addons/sale_journal/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index 88bd8ba3ef4..dc903684be6 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/pt.po b/addons/sale_journal/i18n/pt.po
index c10bcd04f77..1e892e21ce1 100644
--- a/addons/sale_journal/i18n/pt.po
+++ b/addons/sale_journal/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index e46a310eaf5..aa3a892ab8e 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/ro.po b/addons/sale_journal/i18n/ro.po
index 8f5e90209ad..849e27902c4 100644
--- a/addons/sale_journal/i18n/ro.po
+++ b/addons/sale_journal/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index 16b3d24b038..e0e239a21a1 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/sl.po b/addons/sale_journal/i18n/sl.po
index 8aa7bd306ff..bc6dca0d32d 100644
--- a/addons/sale_journal/i18n/sl.po
+++ b/addons/sale_journal/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/sv.po b/addons/sale_journal/i18n/sv.po
index bf63fd13e6f..956059d715a 100644
--- a/addons/sale_journal/i18n/sv.po
+++ b/addons/sale_journal/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/tlh.po b/addons/sale_journal/i18n/tlh.po
index efb4b24defc..bc1d2f42641 100644
--- a/addons/sale_journal/i18n/tlh.po
+++ b/addons/sale_journal/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+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 0a08dfc3468..42bc9a34e30 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/uk.po b/addons/sale_journal/i18n/uk.po
index 37252a997c1..43c8895fc4d 100644
--- a/addons/sale_journal/i18n/uk.po
+++ b/addons/sale_journal/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/zh_CN.po b/addons/sale_journal/i18n/zh_CN.po
index d36117ca116..6f86d0f55bc 100644
--- a/addons/sale_journal/i18n/zh_CN.po
+++ b/addons/sale_journal/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/zh_TW.po b/addons/sale_journal/i18n/zh_TW.po
index ee516f71e7c..998b53df16f 100644
--- a/addons/sale_journal/i18n/zh_TW.po
+++ b/addons/sale_journal/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index f37469bb2a2..7d2d657b7de 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -1,110 +1,110 @@
 <openerp>
 <data>
 
-	<record model="ir.ui.view" id="view_picking_journal_form">
-		<field name="name">sale_journal.picking.journal.form</field>
-		<field name="model">sale_journal.picking.journal</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Picking Journal">
-				<notebook>
-				<page string="Journal">
-					<separator string="Journal Information" colspan="4"/>
-					<field name="name" select="1"/>
-					<field name="code" select="1"/>
-					<field name="user_id" select="1"/>
-					<field name="date" select="1"/>
-					<field name="date_created" select="1"/>
-					<field name="date_validation" select="1"/>
-					<separator string="States" colspan="4"/>
-					<field name="state"/>
-					<group col="3" colspan="2">
+    <record model="ir.ui.view" id="view_picking_journal_form">
+        <field name="name">sale_journal.picking.journal.form</field>
+        <field name="model">sale_journal.picking.journal</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Picking Journal">
+                <notebook>
+                <page string="Journal">
+                    <separator string="Journal Information" colspan="4"/>
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="date_created" select="1"/>
+                    <field name="date_validation" select="1"/>
+                    <separator string="States" colspan="4"/>
+                    <field name="state"/>
+                    <group col="3" colspan="2">
                         <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
                         <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
                         <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
-					</group>
-				</page>
-				<page string="Picking">
+                    </group>
+                </page>
+                <page string="Picking">
                     <button string="Cancel Picking" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
-					<newline/>
-					<field name="picking_stats_ids" colspan="4" nolabel="1"/>
-				</page><page string="Notes">
-					<field name="note" colspan="4" nolabel="1"/>
-				</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_picking_journal_tree">
-		<field name="name">sale_journal.picking.journal.tree</field>
-		<field name="model">sale_journal.picking.journal</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Picking Journal">
-				<field name="name" select="1"/>
-				<field name="code" select="1"/>
-				<field name="user_id" select="1"/>
-				<field name="date" select="1"/>
-				<field name="state"/>
-			</tree>
-		</field>
-	</record>
+                    <newline/>
+                    <field name="picking_stats_ids" colspan="4" nolabel="1"/>
+                </page><page string="Notes">
+                    <field name="note" colspan="4" nolabel="1"/>
+                </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_picking_journal_tree">
+        <field name="name">sale_journal.picking.journal.tree</field>
+        <field name="model">sale_journal.picking.journal</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Picking Journal">
+                <field name="name" select="1"/>
+                <field name="code" select="1"/>
+                <field name="user_id" select="1"/>
+                <field name="date" select="1"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_picking_journal_search">
-		<field name="name">sale_journal.picking.journal.search</field>
-		<field name="model">sale_journal.picking.journal</field>
-		<field name="type">search</field>
-		<field name="arch" type="xml">
-			<search string="Picking Journal">
-				<group col="8" colspan="4">
-					<filter icon="terp-hr" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
-					<filter icon="terp-hr" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
-					<separator orientation="vertical"/>
-					<field name="name" select="1"/>
-					<field name="code" select="1"/>
-					<field name="user_id" select="1" widget="selection"/>
-					<field name="date" select="1"/>
-				</group>
-			</search>
-		</field>
-	</record>
-	<record model="ir.actions.act_window" id="action_definition_picking_journal">
-		<field name="name">Picking journals</field>
-		<field name="res_model">sale_journal.picking.journal</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="search_view_id" ref="view_picking_journal_search"/>
-	</record>
+    <record model="ir.ui.view" id="view_picking_journal_search">
+        <field name="name">sale_journal.picking.journal.search</field>
+        <field name="model">sale_journal.picking.journal</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Picking Journal">
+                <group col="8" colspan="4">
+                    <filter icon="terp-hr" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
+                    <filter icon="terp-hr" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="date" select="1"/>
+                </group>
+            </search>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_definition_picking_journal">
+        <field name="name">Picking journals</field>
+        <field name="res_model">sale_journal.picking.journal</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="view_picking_journal_search"/>
+    </record>
 
-	<menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
+    <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
 
-	<record model="ir.actions.act_window" id="action_invoice_type_tree">
-		<field name="name">Picking by invoice_method</field>
-		<field name="name">sale_journal.invoice.type.tree</field>
-		<field name="res_model">sale_journal.invoice.type</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="view_type">tree</field>
-	</record>
+    <record model="ir.actions.act_window" id="action_invoice_type_tree">
+        <field name="name">Picking by invoice_method</field>
+        <field name="name">sale_journal.invoice.type.tree</field>
+        <field name="res_model">sale_journal.invoice.type</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_type">tree</field>
+    </record>
 
 
-	<!--<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>-->
-	<!--<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>-->
+    <!--<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>-->
+    <!--<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>-->
 
-	<record model="ir.actions.act_window" id="action_invoice_type_picking_open">
-		<field name="name">Picking to invoice</field>
-		<field name="res_model">stock.picking</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
-	</record>
-	<record model="ir.values" id="ir_open_invoice_type">
-		<field name="key2">tree_but_open</field>
-		<field name="model">sale_journal.invoice.type</field>
-		<field name="name">Picking to invoice</field>
-		<field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
-		<field name="object" eval="True"/>
-	</record>
+    <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
+        <field name="name">Picking to invoice</field>
+        <field name="res_model">stock.picking</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
+    </record>
+    <record model="ir.values" id="ir_open_invoice_type">
+        <field name="key2">tree_but_open</field>
+        <field name="model">sale_journal.invoice.type</field>
+        <field name="name">Picking to invoice</field>
+        <field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
+        <field name="object" eval="True"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/scrum/__terp__.py b/addons/scrum/__openerp__.py
similarity index 100%
rename from addons/scrum/__terp__.py
rename to addons/scrum/__openerp__.py
diff --git a/addons/scrum/i18n/ar.po b/addons/scrum/i18n/ar.po
index 3819ae5064c..1373b390bba 100644
--- a/addons/scrum/i18n/ar.po
+++ b/addons/scrum/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/bg.po b/addons/scrum/i18n/bg.po
index daf7b4dd90c..2303abbd3db 100644
--- a/addons/scrum/i18n/bg.po
+++ b/addons/scrum/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/bs.po b/addons/scrum/i18n/bs.po
index b3bdc2b0fee..8f1a559d139 100644
--- a/addons/scrum/i18n/bs.po
+++ b/addons/scrum/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/ca.po b/addons/scrum/i18n/ca.po
index ba517308466..9d114fded06 100644
--- a/addons/scrum/i18n/ca.po
+++ b/addons/scrum/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/cs.po b/addons/scrum/i18n/cs.po
index ffce65308b1..8969b7a4624 100644
--- a/addons/scrum/i18n/cs.po
+++ b/addons/scrum/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/de.po b/addons/scrum/i18n/de.po
index c1ffffd3063..1239fc395a3 100644
--- a/addons/scrum/i18n/de.po
+++ b/addons/scrum/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/es.po b/addons/scrum/i18n/es.po
index 88de279fd14..b68e8b4e115 100644
--- a/addons/scrum/i18n/es.po
+++ b/addons/scrum/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/es_AR.po b/addons/scrum/i18n/es_AR.po
index c2426d843a8..63a987057a3 100644
--- a/addons/scrum/i18n/es_AR.po
+++ b/addons/scrum/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/et.po b/addons/scrum/i18n/et.po
index c8e02490495..986cbc97fd9 100644
--- a/addons/scrum/i18n/et.po
+++ b/addons/scrum/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/fr.po b/addons/scrum/i18n/fr.po
index 1a5d4e470e4..5dd1943ab4a 100644
--- a/addons/scrum/i18n/fr.po
+++ b/addons/scrum/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/hr.po b/addons/scrum/i18n/hr.po
index 1ca82190795..fddfacd6ca8 100644
--- a/addons/scrum/i18n/hr.po
+++ b/addons/scrum/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/hu.po b/addons/scrum/i18n/hu.po
index 1ca82190795..fddfacd6ca8 100644
--- a/addons/scrum/i18n/hu.po
+++ b/addons/scrum/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/id.po b/addons/scrum/i18n/id.po
index 38943b34163..dfefe5db460 100644
--- a/addons/scrum/i18n/id.po
+++ b/addons/scrum/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/it.po b/addons/scrum/i18n/it.po
index a7e3acbac87..6430c02fa7f 100644
--- a/addons/scrum/i18n/it.po
+++ b/addons/scrum/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po
index 91938c8d324..53022cb34d4 100644
--- a/addons/scrum/i18n/ko.po
+++ b/addons/scrum/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/lt.po b/addons/scrum/i18n/lt.po
index 1ca82190795..fddfacd6ca8 100644
--- a/addons/scrum/i18n/lt.po
+++ b/addons/scrum/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/nl.po b/addons/scrum/i18n/nl.po
index 696a7f40670..67260c8214c 100644
--- a/addons/scrum/i18n/nl.po
+++ b/addons/scrum/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/nl_BE.po b/addons/scrum/i18n/nl_BE.po
index c8289a6cc81..e72df9ab121 100644
--- a/addons/scrum/i18n/nl_BE.po
+++ b/addons/scrum/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/pl.po b/addons/scrum/i18n/pl.po
index 039cfdd9dd6..d20440b801d 100644
--- a/addons/scrum/i18n/pl.po
+++ b/addons/scrum/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/pt.po b/addons/scrum/i18n/pt.po
index 947e72b93ef..e55a67392b7 100644
--- a/addons/scrum/i18n/pt.po
+++ b/addons/scrum/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/pt_BR.po b/addons/scrum/i18n/pt_BR.po
index 0304d17d46d..0af567fecf9 100644
--- a/addons/scrum/i18n/pt_BR.po
+++ b/addons/scrum/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/ro.po b/addons/scrum/i18n/ro.po
index 1ca82190795..fddfacd6ca8 100644
--- a/addons/scrum/i18n/ro.po
+++ b/addons/scrum/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/ru.po b/addons/scrum/i18n/ru.po
index 1e7998733af..e6c530210ce 100644
--- a/addons/scrum/i18n/ru.po
+++ b/addons/scrum/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/sl.po b/addons/scrum/i18n/sl.po
index 86da0c659ee..76d7b740f6d 100644
--- a/addons/scrum/i18n/sl.po
+++ b/addons/scrum/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/sv.po b/addons/scrum/i18n/sv.po
index 8b52251a815..048ab9113d7 100644
--- a/addons/scrum/i18n/sv.po
+++ b/addons/scrum/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/tlh.po b/addons/scrum/i18n/tlh.po
index 0cc726f0ac1..97ffa7f9541 100644
--- a/addons/scrum/i18n/tlh.po
+++ b/addons/scrum/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/tr.po b/addons/scrum/i18n/tr.po
index d16ea1500c4..6e133ceb11e 100644
--- a/addons/scrum/i18n/tr.po
+++ b/addons/scrum/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/uk.po b/addons/scrum/i18n/uk.po
index 254e8987df8..d0191439c0b 100644
--- a/addons/scrum/i18n/uk.po
+++ b/addons/scrum/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/zh_CN.po b/addons/scrum/i18n/zh_CN.po
index 04b36a9bc08..8f255bd43f8 100644
--- a/addons/scrum/i18n/zh_CN.po
+++ b/addons/scrum/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/i18n/zh_TW.po b/addons/scrum/i18n/zh_TW.po
index d8c08882107..b5231850287 100644
--- a/addons/scrum/i18n/zh_TW.po
+++ b/addons/scrum/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index 55ff36ae1ba..915332f7f7d 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -75,7 +75,7 @@ class scrum_sprint(osv.osv):
             res.setdefault(sprint.id, 0.0)
             for bl in sprint.backlog_ids:
                 res[sprint.id] += bl.expected_hours
-        return res    
+        return res
     def button_cancel(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         return True
@@ -120,7 +120,7 @@ class scrum_sprint(osv.osv):
             v['scrum_master_id']= proj.user_id and proj.user_id.id or False
             v['date_stop'] = (DateTime.now() + DateTime.RelativeDateTime(days=int(proj.sprint_size or 14))).strftime('%Y-%m-%d')
         return {'value':v}
-        
+
 scrum_sprint()
 
 class scrum_product_backlog(osv.osv):
@@ -167,6 +167,8 @@ class scrum_product_backlog(osv.osv):
 
     def button_cancel(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+        for backlog in self.browse(cr, uid, ids, context=context):
+            self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'cancelled'})
         return True
     def button_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'draft'}, context=context)
@@ -195,10 +197,12 @@ class scrum_product_backlog(osv.osv):
         'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
         'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours'),
         'expected_hours': fields.float('Expected Hours'),
+        'date':fields.datetime("Created Date"),
     }
     _defaults = {
         'state': lambda *a: 'draft',
-        'active': lambda *a: 1
+        'active': lambda *a: 1,
+        'user_id': lambda self,cr,uid,context: uid,
     }
     _order = "sequence"
 scrum_product_backlog()
@@ -234,10 +238,12 @@ class scrum_meeting(osv.osv):
         'name' : fields.char('Meeting Name', size=64, required=True),
         'date': fields.date('Meeting Date', required=True),
         'sprint_id': fields.many2one('scrum.sprint', 'Sprint', required=True),
+        'project_id': fields.many2one('project.project', 'Project'),
         'question_yesterday': fields.text('Tasks since yesterday'),
         'question_today': fields.text('Tasks for today'),
         'question_blocks': fields.text('Blocks encountered'),
         'question_backlog': fields.text('Backlog Accurate'),
+        'task_ids': fields.many2many('project.task', 'meeting_task_rel', 'metting_id', 'task_id', 'Tasks')
     }
     #
     # TODO: Find the right sprint thanks to users and date
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 45415c8b2aa..8824f9dad62 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -45,10 +45,11 @@
                     <field name="expected_hours" sum="Expected hours" widget="float_time"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
-                    <button type="action" string="Convert to Task" name="%(wizard_scrum_backlog_task)d" states="draft,pending" icon="gtk-execute"/>
+                    <button type="action" string="Convert to Task" name="%(wizard_scrum_backlog_task)d" states="pending" icon="gtk-execute"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                     <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-convert"/>
                 </tree>
             </field>
         </record>
@@ -65,6 +66,7 @@
                         <field domain="[('project_id','=',project_id)]" name="sprint_id" select="1"/>
                         <field name="user_id" select="1"/>
                         <field name="sequence"/>
+           			    <field name="date"/>
                         <field name="active" select="1"/>
                         <group colspan="6" col="8">
                             <field name="effective_hours" widget="float_time"/>
@@ -81,13 +83,14 @@
                             <field colspan="4" name="tasks_id" nolabel="1" widget="one2many_list" context="{'default_project_id':project_id, 'default_sprint_id':sprint_id, 'default_product_backlog_id':active_id}"/>
                         </page>
                     </notebook>
-                    <group col="7" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="state" select="1" readonly="1"/>
                         <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
-                        <button type="action" string="Convert to Task" name="%(wizard_scrum_backlog_task)d" states="draft,pending" icon="gtk-execute"/>
+                        <button type="action" string="Convert to Task" name="%(wizard_scrum_backlog_task)d" states="pending" icon="gtk-execute"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                         <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
                         <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
+                        <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -100,7 +103,8 @@
             <field name="arch" type="xml">
                 <search string="Product Backlogs">
                     <group col="10" colspan="4">
-                        <filter icon="terp-project"
+                        <filter name="current"
+                            icon="terp-project"
                             string="Current"
                             domain="['|','&amp;',('sprint_id.date_start','&lt;=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','&gt;=',time.strftime('%%Y-%%m-%%d')), ('state','in',['draft','open'])]"
                             help="Current Backlogs"/>
@@ -109,12 +113,20 @@
                         <filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="project_id"
-                            widget="selection"
-                            />
-                        <field name="sprint_id"/>
+                        <field name="project_id" widget="selection"/>
+                        <field name="sprint_id" widget="selection">
+                        	<filter icon="terp-project"
+                        		string="Sprints"
+                        		domain="[('sprint_id.state','=','open')]"
+                        		help="Backlogs Assigned To Current Sprints"/>
+                        	<filter icon="terp-project"
+                        		string="Sprints"
+                        		domain="[('sprint_id','=',False)]"
+                        		help="Backlogs Not Assigned To Sprints."/>
+                        </field>
                         <field name="user_id" widget="selection">
-                            <filter icon="terp-project"
+                            <filter name="my_features"
+                                icon="terp-project"
                                 string="My Features"
                                 domain="[('user_id','=',uid)]"
                                 help="My Backlogs"/>
@@ -136,7 +148,7 @@
             <field name="name">Product Backlogs</field>
             <field name="res_model">scrum.product.backlog</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_Current":1,"search_default_My Features":1,"search_default_project_id":project_id}</field>
+            <field name="context">{"search_default_current":1,"search_default_my_features":1,"search_default_project_id":project_id}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
         </record>
         <menuitem
@@ -228,14 +240,14 @@
             <field name="arch" type="xml">
                 <search string="Sprints">
                     <group col="10" colspan="4">
-                        <filter icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
+                        <filter name="current" icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
                         <filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
                         <filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection"/>
                         <field name="scrum_master_id" widget="selection">
-                            <filter icon="gtk-execute" string="My Sprints" domain="[('scrum_master_id','=',uid)]"
+                            <filter icon="gtk-execute" name="my_sprints" domain="[('scrum_master_id','=',uid)]"
                                 help="My Sprints"/>
                         </field>
                         <field name="date_start"/>
@@ -259,7 +271,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_scrum_sprint_tree"/>
-            <field name="context">{"search_default_Current":1,"search_default_My Sprints":1}</field>
+            <field name="context">{"search_default_current":1,"search_default_my_sprints":1}</field>
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
         </record>
         <menuitem
@@ -306,6 +318,10 @@
                             <separator colspan="4" string="Are your Sprint Backlog estimate accurate ?"/>
                             <field colspan="4" name="question_backlog" nolabel="1"/>
                         </page>
+                        <page string="Links">
+                            <separator colspan="4" string="Tasks"/>
+                            <field colspan="4" name="task_ids" nolabel="1" domain="[('sprint_id','=',sprint_id)]"/>
+                        </page>
                     </notebook>
                 </form>
             </field>
@@ -318,12 +334,13 @@
             <field name="arch" type="xml">
                 <search string="Scrum Sprint">
                     <group col="10" colspan="4">
-                        <filter icon="terp-project" string="Daily" domain="[('date','=',time.strftime(%%Y-%%m-%%d))]" help="Daily Meetings"/>
+                        <filter icon="terp-project" string="Daily" domain="[('date','=',time.strftime('%%Y%%m%%d'))]" help="Daily Meetings"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="sprint_id">
-                            <filter icon="terp-project" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
+                            <filter icon="terp-project" name="current" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
                         </field>
+                        <field name="project_id" widget="selection"/>
                         <field name="date"/>
                     </group>
                     <newline/>
@@ -340,7 +357,7 @@
             <field name="res_model">scrum.meeting</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{"search_default_Current":1}</field>
+            <field name="context">{"search_default_current":1}</field>
             <field name="search_view_id" ref="view_scrum_meeting_search"/>
         </record>
         <menuitem sequence="30"
diff --git a/addons/scrum/scrum_wizard.xml b/addons/scrum/scrum_wizard.xml
index cb8d4a8bed2..171d30ba37f 100644
--- a/addons/scrum/scrum_wizard.xml
+++ b/addons/scrum/scrum_wizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <wizard id="wizard_scrum_backlog_task" model="scrum.product.backlog" name="scrum.product.backlog.task.create" string="Created tasks"/>
+        <wizard id="wizard_scrum_backlog_task" model="scrum.product.backlog" name="scrum.product.backlog.task.create" string="Create Tasks"/>
         <wizard id="wizard_scrum_backlog_sprint" model="scrum.product.backlog" name="scrum.product.backlog.sprint.assign" string="Assign Sprint"/>
     </data>
 </openerp>
diff --git a/addons/scrum/wizard/assign_backlog_to_sprint.py b/addons/scrum/wizard/assign_backlog_to_sprint.py
index d9805f374e9..fe36344976c 100644
--- a/addons/scrum/wizard/assign_backlog_to_sprint.py
+++ b/addons/scrum/wizard/assign_backlog_to_sprint.py
@@ -41,8 +41,8 @@ bts_form = """<?xml version="1.0" ?>
 
 bts_fields = {
     'sprint_id' : {'string':'Sprint Name', 'type':'many2one', 'relation':'scrum.sprint', 'required':True},
-    'state_open' : {'string':'Set Open', 'type':'boolean'},
-    'convert_to_task' : {'string':'Convert To Task', 'type':'boolean'}
+    'state_open' : {'string':'Set Open', 'type':'boolean', 'default': lambda *a: True},
+    'convert_to_task' : {'string':'Convert To Task', 'type':'boolean', 'default': lambda *a: True}
 }
 
 def _assign_sprint(self, cr, uid, data, context):
diff --git a/addons/scrum/wizard/backlog_to_task.py b/addons/scrum/wizard/backlog_to_task.py
index 631fed686b8..2602b108fda 100644
--- a/addons/scrum/wizard/backlog_to_task.py
+++ b/addons/scrum/wizard/backlog_to_task.py
@@ -51,6 +51,7 @@ def _do_create(self, cr, uid, data, context={}):
             'user_id': data['form']['user_id'] or False,
             'planned_hours': backlog.planned_hours,
             'remaining_hours':backlog.expected_hours,
+            'sequence':backlog.sequence,
         }))
     value = {
         'domain': "[('product_backlog_id','in',["+','.join(map(str,data['ids']))+"])]",
diff --git a/addons/service/__terp__.py b/addons/service/__openerp__.py
similarity index 100%
rename from addons/service/__terp__.py
rename to addons/service/__openerp__.py
diff --git a/addons/mail_gateway/wizard/__init__.py b/addons/smtpclient/__init__.py
similarity index 88%
rename from addons/mail_gateway/wizard/__init__.py
rename to addons/smtpclient/__init__.py
index 496b15be6dd..e33b77854a3 100644
--- a/addons/mail_gateway/wizard/__init__.py
+++ b/addons/smtpclient/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,8 +18,9 @@
 #
 ##############################################################################
 
-import wizard_fetch_mail
-
-
+import smtpclient
+import serveraction
+import ir_model
+import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/smtpclient/__openerp__.py b/addons/smtpclient/__openerp__.py
new file mode 100644
index 00000000000..183a5b70977
--- /dev/null
+++ b/addons/smtpclient/__openerp__.py
@@ -0,0 +1,50 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    "name" : "Email Client",
+    "version" : "1.0",
+    "depends" : ["base"],
+    "author" : "Tiny/Axelor",
+    "description": """Email Client module that provides:
+    Sending Email
+    Use Multiple Server
+    Multi Threading
+    Multi Attachment
+    """,
+    "website" : "http://www.openerp.com",
+    "category" : "Generic Modules",
+    "init_xml" : [
+    ],
+    "demo_xml" : [
+        "smtpclient_demo.xml"
+    ],
+    "update_xml" : [
+        "smtpclient_view.xml",
+        "serveraction_view.xml",
+        "smtpclient_wizard.xml",
+        "security/ir.model.access.csv",
+        "smtpclient_data.xml",
+    ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/smtpclient/i18n/ca.po b/addons/smtpclient/i18n/ca.po
new file mode 100644
index 00000000000..5bbd228f8ba
--- /dev/null
+++ b/addons/smtpclient/i18n/ca.po
@@ -0,0 +1,868 @@
+# Translation of OpenERP Server.
+# This file containt the translation of the following modules:
+#	* smtpclient
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0-rc1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 06:00+0000\n"
+"PO-Revision-Date: 2010-01-19 05:22+0000\n"
+"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-02-25 05:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,bcc:0
+msgid "BCC to"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__number__ for Invoice / Sales Number"
+msgstr "__number__ per a número de Factura / Comanda venda"
+
+#. module: smtpclient
+#: field:email.smtpclient,ssl:0
+msgid "Use SSL?"
+msgstr "Utilitza SSL"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Start Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_verifycode
+msgid "Verify Server"
+msgstr "Verifica servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.sendcode,init,emailto:0
+msgid "Enter the address Email where you want to get the Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Other Mail Servers"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,to:0
+msgid "Mail to"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Message Error!"
+msgstr "Missatge d'error!"
+
+#. module: smtpclient
+#: field:email.smtpclient,name:0
+msgid "Server Name"
+msgstr "Nom servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,header_ids:0
+msgid "Default Headers"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_button:email.testemail,init,send:0
+msgid "Send Email"
+msgstr "Envia Email"
+
+#. module: smtpclient
+#: field:res.company.address,company_id:0
+msgid "Company"
+msgstr "Companyia"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Server already verified!"
+msgstr "El servidor ja està verificat!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#, python-format
+msgid "Verification Failed. Please check the Server Configuration!"
+msgstr "Ha fallat la verificació. Comproveu la configuració del servidor!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error!"
+msgstr "Error del servidor SMTP!"
+
+#. module: smtpclient
+#: field:email.smtpclient,auth_type:0
+#: field:email.smtpclient,type:0
+msgid "Server Type"
+msgstr "Tipus de servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,from_email:0
+msgid "Email From"
+msgstr "Remitent Email"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "User Information"
+msgstr "Informació de l'usuari"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP SMTP server Email Registration Code!"
+msgstr "Codi de registre per Email del servidor SMTP d'OpenERP!"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_report_smtp_server
+#: view:report.smtp.server:0
+msgid "Server Statistics"
+msgstr "Estadístiques del servidor"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Messages"
+msgstr "Missatges"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Sale"
+msgstr "Vendes"
+
+#. module: smtpclient
+#: field:email.headers,value:0
+msgid "Value"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Access Permission"
+msgstr "Permís d'accés"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_headers
+msgid "Email Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue:0
+msgid "Queue Option"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please configure Email Server Messages [Verification / Test]"
+msgstr ""
+"Si us plau, configureu el servidor de missatges per Email [Verificació / "
+"Prova]"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Verification failed. Invalid Verification Code!"
+msgstr "Ha fallat la verificació. Codi de verificació invàlid!"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_history
+msgid "Email History"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.history:0
+msgid "Server History"
+msgstr "Historial servidor"
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Yahoo!!! Server"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,test_email:0
+msgid "Test Message"
+msgstr "Missatge de prova"
+
+#. module: smtpclient
+#: field:report.smtp.server,server_id:0
+msgid "Server ID"
+msgstr "ID servidor"
+
+#. module: smtpclient
+#: help:email.smtpclient,delete_queue_period:0
+msgid "delete emails/contents from email queue after specified no of days"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,no:0
+msgid "Total No."
+msgstr "Núm. total"
+
+#. module: smtpclient
+#: help:email.smtpclient,process_id:0
+msgid "Mail Transport Agent Process"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__user__ for User Name"
+msgstr "__user__ per a nom d'usuari"
+
+#. module: smtpclient
+#: field:email.smtpclient,date_create:0
+msgid "Date Create"
+msgstr "Data creació"
+
+#. module: smtpclient
+#: field:email.smtpclient,state:0
+msgid "Server Status"
+msgstr "Estat servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,error:0
+msgid "Last Error"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.sendcode,init:0
+#: wizard_button:email.sendcode,init,send:0
+msgid "Send Code"
+msgstr "Envia codi"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Read Error!"
+msgstr "Error de lectura!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Unable to read Server Settings"
+msgstr "No és possible llegir la configuració del servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,server_statistics:0
+msgid "Statistics"
+msgstr "Estadístiques"
+
+#. module: smtpclient
+#: wizard_view:email.testemail,init:0
+msgid "Test Email"
+msgstr "Email de prova"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,server_id:0
+msgid "Smtp Server"
+msgstr "Servidor SMTP"
+
+#. module: smtpclient
+#: field:res.company,addresses:0
+msgid "Email Addresses"
+msgstr "Direcció d'Email"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_history_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server_history
+msgid "Email Server History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.testemail,init,emailto:0
+msgid "Enter the address Email where you want to get the Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Not Verified"
+msgstr "No verificat"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,email:0
+msgid "Email"
+msgstr "Email"
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,user_id:0
+msgid "Username"
+msgstr "Nom usuari"
+
+#. module: smtpclient
+#: field:res.company.address,name:0
+msgid "Address Type"
+msgstr "Tipus d'adreça"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Permission"
+msgstr "Permís"
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Message with All Headers"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Message Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Other Information"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Configuration"
+msgstr "Configuració"
+
+#. module: smtpclient
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invàlid per a la definició de la vista!"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,disclaimers:0
+msgid "Disclaimers"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,name:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: smtpclient
+#: view:res.company:0
+msgid "SMTP Settings"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,body:0
+msgid ""
+"The message text that will be send along with the email which is send "
+"through this server"
+msgstr ""
+"El text del missatge que serà enviat junt amb l'Email que és enviat "
+"mitjançant aquest servidor"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_testemail
+msgid "Send Test Email"
+msgstr "Envia Email de prova"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_queue
+msgid "Email Queue"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Server Information"
+msgstr "Informació del servidor"
+
+#. module: smtpclient
+#: help:email.verifycode,init,code:0
+msgid "Enter the verification code thay you get in your verification Email"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_history
+msgid "Email Client History"
+msgstr "Historial del client d'Email"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Never Delete Message"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP Test Email!"
+msgstr "Email de prova d'OpenERP!"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,body:0
+#: view:email.smtpclient.queue:0
+#: field:email.smtpclient.queue,serialized_message:0
+msgid "Message"
+msgstr "Missatge"
+
+#. module: smtpclient
+#: field:email.smtpclient,process_id:0
+msgid "MTA Process"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,server_id:0
+#: view:email.smtpclient:0
+#: field:email.smtpclient,server:0
+#: field:email.smtpclient.queue,server_id:0
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server
+msgid "SMTP Server"
+msgstr "Servidor SMTP"
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Google Server"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Verified"
+msgstr "Verificat"
+
+#. module: smtpclient
+#: help:email.smtpclient,priority:0
+msgid ""
+"Priority between 0 to 10, will be used to define the MTA process priotiry"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,port:0
+msgid "SMTP Port"
+msgstr "Port SMTP"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Email TO Address not Defined !"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,auth:0
+msgid "Use Auth"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,pstate:0
+msgid "Server Statue"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,user:0
+msgid "User Name"
+msgstr "Nom usuari"
+
+#. module: smtpclient
+#: field:email.smtpclient,verify_email:0
+msgid "Verify Message"
+msgstr "Verifica missatge"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient
+#: model:ir.module.module,shortdesc:smtpclient.module_meta_information
+msgid "Email Client"
+msgstr "Client Email"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Disclaimers Message"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__code__ for Verification Code"
+msgstr "__code__ per a codi de verificació"
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Queued"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,date_create:0
+#: field:email.smtpclient.queue,date_create:0
+msgid "Date"
+msgstr "Data"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,cc:0
+msgid "CC to"
+msgstr ""
+
+#. module: smtpclient
+#: model:email.smtpclient,verify_email:smtpclient.email_smtpclient_sendmailserver0
+msgid ""
+"Verification Message. This is the code\n"
+"__code__ \n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"Created by user __user__"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_queue_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server_queue
+msgid "Message Queue"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Default"
+msgstr "Per defecte"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete Content After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "You have no permission to access SMTP Server : %s "
+msgstr "No teniu permís per accedir al servidor SMTP: %s "
+
+#. module: smtpclient
+#: field:email.smtpclient,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_queue
+msgid "Message Queus"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#: view:email.smtpclient.queue:0
+#: selection:email.smtpclient.queue,state:0
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server Error!"
+msgstr "Error del servidor!"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Clear All After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid ""
+"Please verify Email Server, without verification you can not send Email(s)."
+msgstr ""
+"Si us plau, verifiqueu el servidor de correu electrònic, sense verificar-lo "
+"no podeu enviar Email(s)."
+
+#. module: smtpclient
+#: field:email.smtpclient,history_line:0
+#: field:report.smtp.server,history:0
+msgid "History"
+msgstr "Historial"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,priority:0
+msgid "Message Priority"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,file_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__name__ for Customer Name"
+msgstr "__name__ per a nom de client"
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "General"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,key:0
+msgid "Header"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid ""
+"Verification Message. This is the code\n"
+"\n"
+"__code__\n"
+"\n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"\n"
+"Created by user __user__"
+msgstr ""
+"Missatge de verificació. Aquest és el codi\n"
+"\n"
+"__code__\n"
+"\n"
+"que haureu de copiar al servidor d'Email d'OpenERP (assistent Verifica "
+"servidor).\n"
+"\n"
+"Creat per l'usuari __user__"
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: smtpclient
+#: wizard_view:email.verifycode,init:0
+#: wizard_button:email.verifycode,init,check:0
+msgid "Verify Code"
+msgstr "Verifica codi"
+
+#. module: smtpclient
+#: wizard_button:email.sendcode,init,end:0
+#: wizard_button:email.testemail,init,end:0
+#: wizard_button:email.verifycode,init,end:0
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue_period:0
+msgid "Delete after"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server is not Verified, Please Verify the Server !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,resource_id:0
+msgid "Resource ID"
+msgstr "ID del registre"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Data Error !"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+"especial!"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete when Email Sent"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Account"
+msgstr "Comptabilitat"
+
+#. module: smtpclient
+#: model:ir.module.module,description:smtpclient.module_meta_information
+msgid ""
+"Email Client module that provides:\n"
+"    Sending Email\n"
+"    Use Multiple Server\n"
+"    Multi Threading\n"
+"    Multi Attachment\n"
+"    "
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Stock"
+msgstr "Estoc"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,name:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: smtpclient
+#: field:email.smtpclient,code:0
+#: wizard_field:email.verifycode,init,code:0
+msgid "Verification Code"
+msgstr "Codi de verificació"
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Stop"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,body:0
+msgid "Email Text"
+msgstr ""
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Delivery"
+msgstr "Enviament"
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Running"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Last Error occured"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Waiting for Verification"
+msgstr "Esperant verificació"
+
+#. module: smtpclient
+#: field:email.smtpclient,password:0
+msgid "Password"
+msgstr "Contrasenya"
+
+#. module: smtpclient
+#: field:email.smtpclient,users_id:0
+msgid "Users Allowed"
+msgstr "Usuaris permesos"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#, python-format
+msgid "Verification Code Already Generated !"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_field:email.sendcode,init,emailto:0
+#: field:email.smtpclient,email:0
+#: wizard_field:email.testemail,init,emailto:0
+#: view:res.company:0
+#: field:res.company.address,email:0
+msgid "Email Address"
+msgstr "Direcció de correu"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Message"
+msgstr "Missatge de verificació"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Stop Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server
+msgid "Email Servers"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_sendcode
+msgid "Send Verification Code"
+msgstr "Envia codi de verificació"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,model:0
+msgid "Model"
+msgstr "Model"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_tree
+#: field:ir.actions.server,email_server:0
+msgid "Email Server"
+msgstr "Servidor Email"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Permission Error!"
+msgstr "Error dels permisos!"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_res_company_address
+msgid "res.company.address"
+msgstr "res.company.address"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,state:0
+msgid "Message Status"
+msgstr ""
+
+#~ msgid "The Email is sent successfully to corresponding address"
+#~ msgstr "El correu ha estat enviat correctament a la direcció corresponent"
+
+#~ msgid "Servers"
+#~ msgstr "Servidors"
+
+#~ msgid "Verification Information"
+#~ msgstr "Informació de verificació"
+
+#~ msgid "Report name and Resources ids are required!"
+#~ msgstr "Nom d'informe i ids de registres són necessaris!"
diff --git a/addons/smtpclient/i18n/ca_ES.po b/addons/smtpclient/i18n/ca_ES.po
new file mode 100644
index 00000000000..805d787799f
--- /dev/null
+++ b/addons/smtpclient/i18n/ca_ES.po
@@ -0,0 +1,505 @@
+# Translation of OpenERP Server.
+# This file containt the translation of the following modules:
+#	* smtpclient
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0-rc1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-11-30 15:52:27+0000\n"
+"PO-Revision-Date: 2008-11-30 17:41+0100\n"
+"Last-Translator: Jordi Esteve <jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__number__ for Invoice / Sales Number"
+msgstr "__number__ per a número de Factura / Comanda venda"
+
+#. module: smtpclient
+#: field:email.smtpclient,ssl:0
+msgid "Use SSL?"
+msgstr "Utilitza SSL"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_verifycode
+msgid "Verify Server"
+msgstr "Verifica servidor"
+
+#. module: smtpclient
+#: wizard_view:email.sendcode,init:0
+#: wizard_button:email.sendcode,init,send:0
+msgid "Send Code"
+msgstr "Envia codi"
+
+#. module: smtpclient
+#: wizard_view:email.testemail,init:0
+msgid "Test Email"
+msgstr "Email de prova"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Message Error!"
+msgstr "Missatge d'error!"
+
+#. module: smtpclient
+#: field:email.smtpclient,test_email:0
+#: view:email.smtpclient:0
+msgid "Test Message"
+msgstr "Missatge de prova"
+
+#. module: smtpclient
+#: wizard_button:email.testemail,init,send:0
+msgid "Send Email"
+msgstr "Envia Email"
+
+#. module: smtpclient
+#: field:email.smtpclient,server:0
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server
+#: view:email.smtpclient:0
+msgid "SMTP Server"
+msgstr "Servidor SMTP"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Server already verified!"
+msgstr "El servidor ja està verificat!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#, python-format
+msgid "Verification Failed. Please check the Server Configuration!"
+msgstr "Ha fallat la verificació. Comproveu la configuració del servidor!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please verify Email Server, without verification you can not send Email(s)."
+msgstr "Si us plau, verifiqueu el servidor de correu electrònic, sense verificar-lo no podeu enviar Email(s)."
+
+#. module: smtpclient
+#: field:email.smtpclient,type:0
+msgid "Server Type"
+msgstr "Tipus de servidor"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "The Email is sent successfully to corresponding address"
+msgstr "El correu ha estat enviat correctament a la direcció corresponent"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Account"
+msgstr "Comptabilitat"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "User Information"
+msgstr "Informació de l'usuari"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP SMTP server Email Registration Code!"
+msgstr "Codi de registre per Email del servidor SMTP d'OpenERP!"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_report_smtp_server
+#: view:report.smtp.server:0
+msgid "Server Statistics"
+msgstr "Estadístiques del servidor"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Message"
+msgstr "Missatge de verificació"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Sale"
+msgstr "Vendes"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Access Permission"
+msgstr "Permís d'accés"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please configure Email Server Messages [Verification / Test]"
+msgstr "Si us plau, configureu el servidor de missatges per Email [Verificació / Prova]"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Verification failed. Invalid Verification Code!"
+msgstr "Ha fallat la verificació. Codi de verificació invàlid!"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: view:email.smtpclient.history:0
+msgid "Server History"
+msgstr "Historial servidor"
+
+#. module: smtpclient
+#: field:report.smtp.server,server_id:0
+msgid "Server ID"
+msgstr "ID servidor"
+
+#. module: smtpclient
+#: field:report.smtp.server,no:0
+msgid "Total No."
+msgstr "Núm. total"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__user__ for User Name"
+msgstr "__user__ per a nom d'usuari"
+
+#. module: smtpclient
+#: field:email.smtpclient,date_create:0
+msgid "Date Create"
+msgstr "Data creació"
+
+#. module: smtpclient
+#: field:email.smtpclient,active:0
+msgid "Active"
+msgstr "Actiu"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Unable to read Server Settings"
+msgstr "No és possible llegir la configuració del servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,server_statistics:0
+#: view:email.smtpclient:0
+msgid "Statistics"
+msgstr "Estadístiques"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,server_id:0
+msgid "Smtp Server"
+msgstr "Servidor SMTP"
+
+#. module: smtpclient
+#: field:res.company,addresses:0
+msgid "Email Addresses"
+msgstr "Direcció d'Email"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "You have no permission to access SMTP Server : %s "
+msgstr "No teniu permís per accedir al servidor SMTP: %s "
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Not Verified"
+msgstr "No verificat"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,email:0
+msgid "Email"
+msgstr "Email"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,user_id:0
+msgid "Username"
+msgstr "Nom usuari"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_sendcode
+msgid "Send Verification Code"
+msgstr "Envia codi de verificació"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Permission"
+msgstr "Permís"
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_cofiguration
+#: view:email.smtpclient:0
+msgid "Configuration"
+msgstr "Configuració"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Read Error!"
+msgstr "Error de lectura!"
+
+#. module: smtpclient
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invàlid per a la definició de la vista!"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient
+msgid "Email Client"
+msgstr "Client Email"
+
+#. module: smtpclient
+#: help:email.smtpclient,body:0
+msgid "The message text that will be send along with the email which is send through this server"
+msgstr "El text del missatge que serà enviat junt amb l'Email que és enviat mitjançant aquest servidor"
+
+#. module: smtpclient
+#: field:report.smtp.server,name:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: smtpclient
+#: wizard_view:email.verifycode,init:0
+#: wizard_button:email.verifycode,init,check:0
+msgid "Verify Code"
+msgstr "Verifica codi"
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server
+msgid "Servers"
+msgstr "Servidors"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_history
+msgid "Email Client History"
+msgstr "Historial del client d'Email"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP Test Email!"
+msgstr "Email de prova d'OpenERP!"
+
+#. module: smtpclient
+#: field:email.smtpclient,body:0
+#: view:email.smtpclient:0
+msgid "Message"
+msgstr "Missatge"
+
+#. module: smtpclient
+#: field:res.company.address,company_id:0
+msgid "Company"
+msgstr "Companyia"
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Verified"
+msgstr "Verificat"
+
+#. module: smtpclient
+#: field:email.smtpclient,name:0
+msgid "Server Name"
+msgstr "Nom servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,port:0
+msgid "SMTP Port"
+msgstr "Port SMTP"
+
+#. module: smtpclient
+#: field:email.smtpclient,state:0
+msgid "Server Status"
+msgstr "Estat servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,verify_email:0
+msgid "Verify Message"
+msgstr "Verifica missatge"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_testemail
+msgid "Send Test Email"
+msgstr "Envia Email de prova"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__code__ for Verification Code"
+msgstr "__code__ per a codi de verificació"
+
+#. module: smtpclient
+#: field:email.smtpclient,user:0
+msgid "User Name"
+msgstr "Nom usuari"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,date_create:0
+msgid "Date"
+msgstr "Data"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Default"
+msgstr "Per defecte"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Permission Error!"
+msgstr "Error dels permisos!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server Error!"
+msgstr "Error del servidor!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error!"
+msgstr "Error del servidor SMTP!"
+
+#. module: smtpclient
+#: field:email.smtpclient,history_line:0
+#: field:report.smtp.server,history:0
+#: view:email.smtpclient:0
+msgid "History"
+msgstr "Historial"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Verification Message. This is the code\n\n__code__\n\nyou must copy in the OpenERP Email Server (Verify Server wizard).\n\nCreated by user __user__"
+msgstr "Missatge de verificació. Aquest és el codi\n\n__code__\n\nque haureu de copiar al servidor d'Email d'OpenERP (assistent Verifica servidor).\n\nCreat per l'usuari __user__"
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Server Information"
+msgstr "Informació del servidor"
+
+#. module: smtpclient
+#: wizard_button:email.sendcode,init,end:0
+#: wizard_button:email.testemail,init,end:0
+#: wizard_button:email.verifycode,init,end:0
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,resource_id:0
+msgid "Resource ID"
+msgstr "ID del registre"
+
+#. module: smtpclient
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter especial!"
+
+#. module: smtpclient
+#: field:email.smtpclient,from:0
+msgid "Email From"
+msgstr "Remitent Email"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Information"
+msgstr "Informació de verificació"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Stock"
+msgstr "Estoc"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,name:0
+msgid "Description"
+msgstr "Descripció"
+
+#. module: smtpclient
+#: wizard_field:email.verifycode,init,code:0
+#: field:email.smtpclient,code:0
+msgid "Verification Code"
+msgstr "Codi de verificació"
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Delivery"
+msgstr "Enviament"
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Waiting for Verification"
+msgstr "Esperant verificació"
+
+#. module: smtpclient
+#: field:email.smtpclient,password:0
+msgid "Password"
+msgstr "Contrasenya"
+
+#. module: smtpclient
+#: field:email.smtpclient,users_id:0
+msgid "Users Allowed"
+msgstr "Usuaris permesos"
+
+#. module: smtpclient
+#: wizard_field:email.sendcode,init,emailto:0
+#: wizard_field:email.testemail,init,emailto:0
+#: field:email.smtpclient,email:0
+#: field:res.company.address,email:0
+#: view:res.company:0
+msgid "Email Address"
+msgstr "Direcció de correu"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Messages"
+msgstr "Missatges"
+
+#. module: smtpclient
+#: field:res.company.address,name:0
+msgid "Address Type"
+msgstr "Tipus d'adreça"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,model:0
+#: field:report.smtp.server,model:0
+msgid "Model"
+msgstr "Model"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_tree
+msgid "Email Server"
+msgstr "Servidor Email"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Report name and Resources ids are required!"
+msgstr "Nom d'informe i ids de registres són necessaris!"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__name__ for Customer Name"
+msgstr "__name__ per a nom de client"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_res_company_address
+msgid "res.company.address"
+msgstr "res.company.address"
+
diff --git a/addons/smtpclient/i18n/es.po b/addons/smtpclient/i18n/es.po
new file mode 100644
index 00000000000..d3bee99f6f5
--- /dev/null
+++ b/addons/smtpclient/i18n/es.po
@@ -0,0 +1,870 @@
+# Translation of OpenERP Server.
+# This file containt the translation of the following modules:
+#	* smtpclient
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0-rc1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 06:00+0000\n"
+"PO-Revision-Date: 2010-01-19 05:21+0000\n"
+"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-02-25 05:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,bcc:0
+msgid "BCC to"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__number__ for Invoice / Sales Number"
+msgstr "__number__ para número de Factura / Pedido venta"
+
+#. module: smtpclient
+#: field:email.smtpclient,ssl:0
+msgid "Use SSL?"
+msgstr "Utilizar SSL"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Start Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_verifycode
+msgid "Verify Server"
+msgstr "Verificar servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.sendcode,init,emailto:0
+msgid "Enter the address Email where you want to get the Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Other Mail Servers"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,to:0
+msgid "Mail to"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Message Error!"
+msgstr "¡Mensaje de error!"
+
+#. module: smtpclient
+#: field:email.smtpclient,name:0
+msgid "Server Name"
+msgstr "Nombre servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,header_ids:0
+msgid "Default Headers"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_button:email.testemail,init,send:0
+msgid "Send Email"
+msgstr "Enviar Email"
+
+#. module: smtpclient
+#: field:res.company.address,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Server already verified!"
+msgstr "¡El servidor ya está verificado!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#, python-format
+msgid "Verification Failed. Please check the Server Configuration!"
+msgstr ""
+"Ha fallado la verificación. ¡Compruebe la configuración del servidor!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error!"
+msgstr "¡Error del servidor SMTP!"
+
+#. module: smtpclient
+#: field:email.smtpclient,auth_type:0
+#: field:email.smtpclient,type:0
+msgid "Server Type"
+msgstr "Tipo de servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,from_email:0
+msgid "Email From"
+msgstr "Remitente Email"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "User Information"
+msgstr "Información del usuario"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP SMTP server Email Registration Code!"
+msgstr "¡Código de registro por Email del servidor SMTP de OpenERP!"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_report_smtp_server
+#: view:report.smtp.server:0
+msgid "Server Statistics"
+msgstr "Estadísticas del servidor"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Sale"
+msgstr "Ventas"
+
+#. module: smtpclient
+#: field:email.headers,value:0
+msgid "Value"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Access Permission"
+msgstr "Permiso de acceso"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_headers
+msgid "Email Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue:0
+msgid "Queue Option"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please configure Email Server Messages [Verification / Test]"
+msgstr ""
+"Por favor, configure el servidor de mensajes por Email [Verificación / "
+"Prueba]"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Verification failed. Invalid Verification Code!"
+msgstr "Ha fallado la verificación. ¡Código de verificación inválido!"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_history
+msgid "Email History"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.history:0
+msgid "Server History"
+msgstr "Historial servidor"
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Yahoo!!! Server"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,test_email:0
+msgid "Test Message"
+msgstr "Mensaje de prueba"
+
+#. module: smtpclient
+#: field:report.smtp.server,server_id:0
+msgid "Server ID"
+msgstr "ID servidor"
+
+#. module: smtpclient
+#: help:email.smtpclient,delete_queue_period:0
+msgid "delete emails/contents from email queue after specified no of days"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,no:0
+msgid "Total No."
+msgstr "Núm. total"
+
+#. module: smtpclient
+#: help:email.smtpclient,process_id:0
+msgid "Mail Transport Agent Process"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__user__ for User Name"
+msgstr "__user__ para nombre de usuario"
+
+#. module: smtpclient
+#: field:email.smtpclient,date_create:0
+msgid "Date Create"
+msgstr "Fecha creación"
+
+#. module: smtpclient
+#: field:email.smtpclient,state:0
+msgid "Server Status"
+msgstr "Estado servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,error:0
+msgid "Last Error"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.sendcode,init:0
+#: wizard_button:email.sendcode,init,send:0
+msgid "Send Code"
+msgstr "Enviar código"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Read Error!"
+msgstr "¡Error de lectura!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Unable to read Server Settings"
+msgstr "No es posible leer la configuración del servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,server_statistics:0
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#. module: smtpclient
+#: wizard_view:email.testemail,init:0
+msgid "Test Email"
+msgstr "Email de prueba"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,server_id:0
+msgid "Smtp Server"
+msgstr "Servidor SMTP"
+
+#. module: smtpclient
+#: field:res.company,addresses:0
+msgid "Email Addresses"
+msgstr "Dirección de Email"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_history_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server_history
+msgid "Email Server History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.testemail,init,emailto:0
+msgid "Enter the address Email where you want to get the Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Not Verified"
+msgstr "No verificado"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,email:0
+msgid "Email"
+msgstr "Email"
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,user_id:0
+msgid "Username"
+msgstr "Nombre usuario"
+
+#. module: smtpclient
+#: field:res.company.address,name:0
+msgid "Address Type"
+msgstr "Tipo de dirección"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Permission"
+msgstr "Permiso"
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Message with All Headers"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Message Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Other Information"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: smtpclient
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,disclaimers:0
+msgid "Disclaimers"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,name:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: smtpclient
+#: view:res.company:0
+msgid "SMTP Settings"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,body:0
+msgid ""
+"The message text that will be send along with the email which is send "
+"through this server"
+msgstr ""
+"El texto del mensaje que será enviado junto con el Email que es enviado "
+"mediante este servidor"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_testemail
+msgid "Send Test Email"
+msgstr "Enviar Email de prueba"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_queue
+msgid "Email Queue"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Server Information"
+msgstr "Información del servidor"
+
+#. module: smtpclient
+#: help:email.verifycode,init,code:0
+msgid "Enter the verification code thay you get in your verification Email"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_history
+msgid "Email Client History"
+msgstr "Historial del cliente de Email"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Never Delete Message"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP Test Email!"
+msgstr "¡Email de prueba de OpenERP!"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,body:0
+#: view:email.smtpclient.queue:0
+#: field:email.smtpclient.queue,serialized_message:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: smtpclient
+#: field:email.smtpclient,process_id:0
+msgid "MTA Process"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,server_id:0
+#: view:email.smtpclient:0
+#: field:email.smtpclient,server:0
+#: field:email.smtpclient.queue,server_id:0
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server
+msgid "SMTP Server"
+msgstr "Servidor SMTP"
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Google Server"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Verified"
+msgstr "Verificado"
+
+#. module: smtpclient
+#: help:email.smtpclient,priority:0
+msgid ""
+"Priority between 0 to 10, will be used to define the MTA process priotiry"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,port:0
+msgid "SMTP Port"
+msgstr "Puerto SMTP"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Email TO Address not Defined !"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,auth:0
+msgid "Use Auth"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,pstate:0
+msgid "Server Statue"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,user:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: smtpclient
+#: field:email.smtpclient,verify_email:0
+msgid "Verify Message"
+msgstr "Verificar mensaje"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient
+#: model:ir.module.module,shortdesc:smtpclient.module_meta_information
+msgid "Email Client"
+msgstr "Cliente Email"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Disclaimers Message"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__code__ for Verification Code"
+msgstr "__code__ para código de verificación"
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Queued"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,date_create:0
+#: field:email.smtpclient.queue,date_create:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,cc:0
+msgid "CC to"
+msgstr ""
+
+#. module: smtpclient
+#: model:email.smtpclient,verify_email:smtpclient.email_smtpclient_sendmailserver0
+msgid ""
+"Verification Message. This is the code\n"
+"__code__ \n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"Created by user __user__"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_queue_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server_queue
+msgid "Message Queue"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Default"
+msgstr "Por defecto"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete Content After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "You have no permission to access SMTP Server : %s "
+msgstr "No tiene permiso para acceder al servidor SMTP: %s "
+
+#. module: smtpclient
+#: field:email.smtpclient,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_queue
+msgid "Message Queus"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#: view:email.smtpclient.queue:0
+#: selection:email.smtpclient.queue,state:0
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server Error!"
+msgstr "¡Error del servidor!"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Clear All After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid ""
+"Please verify Email Server, without verification you can not send Email(s)."
+msgstr ""
+"Por favor, verifique el servidor de correo electrónico, sin verificarlo no "
+"puede enviar Email(s)."
+
+#. module: smtpclient
+#: field:email.smtpclient,history_line:0
+#: field:report.smtp.server,history:0
+msgid "History"
+msgstr "Historial"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,priority:0
+msgid "Message Priority"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,file_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__name__ for Customer Name"
+msgstr "__name__ para nombre de cliente"
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "General"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,key:0
+msgid "Header"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid ""
+"Verification Message. This is the code\n"
+"\n"
+"__code__\n"
+"\n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"\n"
+"Created by user __user__"
+msgstr ""
+"Mensaje de verificación. Éste es el código\n"
+"\n"
+"__code__\n"
+"\n"
+"que deberá copiar en el servidor de Email de OpenERP (asistente Verificar "
+"servidor).\n"
+"\n"
+"Creado por el usuario __user__"
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: smtpclient
+#: wizard_view:email.verifycode,init:0
+#: wizard_button:email.verifycode,init,check:0
+msgid "Verify Code"
+msgstr "Verificar código"
+
+#. module: smtpclient
+#: wizard_button:email.sendcode,init,end:0
+#: wizard_button:email.testemail,init,end:0
+#: wizard_button:email.verifycode,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue_period:0
+msgid "Delete after"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server is not Verified, Please Verify the Server !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,resource_id:0
+msgid "Resource ID"
+msgstr "ID del registro"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Data Error !"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete when Email Sent"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Account"
+msgstr "Contabilidad"
+
+#. module: smtpclient
+#: model:ir.module.module,description:smtpclient.module_meta_information
+msgid ""
+"Email Client module that provides:\n"
+"    Sending Email\n"
+"    Use Multiple Server\n"
+"    Multi Threading\n"
+"    Multi Attachment\n"
+"    "
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Stock"
+msgstr "Stock"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: smtpclient
+#: field:email.smtpclient,code:0
+#: wizard_field:email.verifycode,init,code:0
+msgid "Verification Code"
+msgstr "Código de verificación"
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Stop"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,body:0
+msgid "Email Text"
+msgstr ""
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Delivery"
+msgstr "Envío"
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Running"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Last Error occured"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Waiting for Verification"
+msgstr "Esperando verificación"
+
+#. module: smtpclient
+#: field:email.smtpclient,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: smtpclient
+#: field:email.smtpclient,users_id:0
+msgid "Users Allowed"
+msgstr "Usuarios permitidos"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#, python-format
+msgid "Verification Code Already Generated !"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_field:email.sendcode,init,emailto:0
+#: field:email.smtpclient,email:0
+#: wizard_field:email.testemail,init,emailto:0
+#: view:res.company:0
+#: field:res.company.address,email:0
+msgid "Email Address"
+msgstr "Dirección de correo"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Message"
+msgstr "Mensaje de verificación"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Stop Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server
+msgid "Email Servers"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_sendcode
+msgid "Send Verification Code"
+msgstr "Enviar código de verificación"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,model:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_tree
+#: field:ir.actions.server,email_server:0
+msgid "Email Server"
+msgstr "Servidor Email"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Permission Error!"
+msgstr "¡Error de los permisos!"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_res_company_address
+msgid "res.company.address"
+msgstr "res.company.address"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,state:0
+msgid "Message Status"
+msgstr ""
+
+#~ msgid "The Email is sent successfully to corresponding address"
+#~ msgstr ""
+#~ "El correo ha sido enviado correctamente a la dirección correspondiente"
+
+#~ msgid "Servers"
+#~ msgstr "Servidores"
+
+#~ msgid "Verification Information"
+#~ msgstr "Información de verificación"
+
+#~ msgid "Report name and Resources ids are required!"
+#~ msgstr "¡Nombre de informe y ids de registros son necesarios!"
diff --git a/addons/smtpclient/i18n/es_ES.po b/addons/smtpclient/i18n/es_ES.po
new file mode 100644
index 00000000000..9cc780f7bf1
--- /dev/null
+++ b/addons/smtpclient/i18n/es_ES.po
@@ -0,0 +1,505 @@
+# Translation of OpenERP Server.
+# This file containt the translation of the following modules:
+#	* smtpclient
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0-rc1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-11-30 15:52:27+0000\n"
+"PO-Revision-Date: 2008-11-30 17:41+0100\n"
+"Last-Translator: Jordi Esteve <jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__number__ for Invoice / Sales Number"
+msgstr "__number__ para número de Factura / Pedido venta"
+
+#. module: smtpclient
+#: field:email.smtpclient,ssl:0
+msgid "Use SSL?"
+msgstr "Utilizar SSL"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_verifycode
+msgid "Verify Server"
+msgstr "Verificar servidor"
+
+#. module: smtpclient
+#: wizard_view:email.sendcode,init:0
+#: wizard_button:email.sendcode,init,send:0
+msgid "Send Code"
+msgstr "Enviar código"
+
+#. module: smtpclient
+#: wizard_view:email.testemail,init:0
+msgid "Test Email"
+msgstr "Email de prueba"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Message Error!"
+msgstr "¡Mensaje de error!"
+
+#. module: smtpclient
+#: field:email.smtpclient,test_email:0
+#: view:email.smtpclient:0
+msgid "Test Message"
+msgstr "Mensaje de prueba"
+
+#. module: smtpclient
+#: wizard_button:email.testemail,init,send:0
+msgid "Send Email"
+msgstr "Enviar Email"
+
+#. module: smtpclient
+#: field:email.smtpclient,server:0
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server
+#: view:email.smtpclient:0
+msgid "SMTP Server"
+msgstr "Servidor SMTP"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Server already verified!"
+msgstr "¡El servidor ya está verificado!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#, python-format
+msgid "Verification Failed. Please check the Server Configuration!"
+msgstr "Ha fallado la verificación. ¡Compruebe la configuración del servidor!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please verify Email Server, without verification you can not send Email(s)."
+msgstr "Por favor, verifique el servidor de correo electrónico, sin verificarlo no puede enviar Email(s)."
+
+#. module: smtpclient
+#: field:email.smtpclient,type:0
+msgid "Server Type"
+msgstr "Tipo de servidor"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "The Email is sent successfully to corresponding address"
+msgstr "El correo ha sido enviado correctamente a la dirección correspondiente"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Account"
+msgstr "Contabilidad"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "User Information"
+msgstr "Información del usuario"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP SMTP server Email Registration Code!"
+msgstr "¡Código de registro por Email del servidor SMTP de OpenERP!"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_report_smtp_server
+#: view:report.smtp.server:0
+msgid "Server Statistics"
+msgstr "Estadísticas del servidor"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Message"
+msgstr "Mensaje de verificación"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Sale"
+msgstr "Ventas"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Access Permission"
+msgstr "Permiso de acceso"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please configure Email Server Messages [Verification / Test]"
+msgstr "Por favor, configure el servidor de mensajes por Email [Verificación / Prueba]"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Verification failed. Invalid Verification Code!"
+msgstr "Ha fallado la verificación. ¡Código de verificación inválido!"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: view:email.smtpclient.history:0
+msgid "Server History"
+msgstr "Historial servidor"
+
+#. module: smtpclient
+#: field:report.smtp.server,server_id:0
+msgid "Server ID"
+msgstr "ID servidor"
+
+#. module: smtpclient
+#: field:report.smtp.server,no:0
+msgid "Total No."
+msgstr "Núm. total"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__user__ for User Name"
+msgstr "__user__ para nombre de usuario"
+
+#. module: smtpclient
+#: field:email.smtpclient,date_create:0
+msgid "Date Create"
+msgstr "Fecha creación"
+
+#. module: smtpclient
+#: field:email.smtpclient,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Unable to read Server Settings"
+msgstr "No es posible leer la configuración del servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,server_statistics:0
+#: view:email.smtpclient:0
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,server_id:0
+msgid "Smtp Server"
+msgstr "Servidor SMTP"
+
+#. module: smtpclient
+#: field:res.company,addresses:0
+msgid "Email Addresses"
+msgstr "Dirección de Email"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "You have no permission to access SMTP Server : %s "
+msgstr "No tiene permiso para acceder al servidor SMTP: %s "
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Not Verified"
+msgstr "No verificado"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,email:0
+msgid "Email"
+msgstr "Email"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,user_id:0
+msgid "Username"
+msgstr "Nombre usuario"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_sendcode
+msgid "Send Verification Code"
+msgstr "Enviar código de verificación"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Permission"
+msgstr "Permiso"
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_cofiguration
+#: view:email.smtpclient:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Read Error!"
+msgstr "¡Error de lectura!"
+
+#. module: smtpclient
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient
+msgid "Email Client"
+msgstr "Cliente Email"
+
+#. module: smtpclient
+#: help:email.smtpclient,body:0
+msgid "The message text that will be send along with the email which is send through this server"
+msgstr "El texto del mensaje que será enviado junto con el Email que es enviado mediante este servidor"
+
+#. module: smtpclient
+#: field:report.smtp.server,name:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: smtpclient
+#: wizard_view:email.verifycode,init:0
+#: wizard_button:email.verifycode,init,check:0
+msgid "Verify Code"
+msgstr "Verificar código"
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server
+msgid "Servers"
+msgstr "Servidores"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_history
+msgid "Email Client History"
+msgstr "Historial del cliente de Email"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP Test Email!"
+msgstr "¡Email de prueba de OpenERP!"
+
+#. module: smtpclient
+#: field:email.smtpclient,body:0
+#: view:email.smtpclient:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: smtpclient
+#: field:res.company.address,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Verified"
+msgstr "Verificado"
+
+#. module: smtpclient
+#: field:email.smtpclient,name:0
+msgid "Server Name"
+msgstr "Nombre servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,port:0
+msgid "SMTP Port"
+msgstr "Puerto SMTP"
+
+#. module: smtpclient
+#: field:email.smtpclient,state:0
+msgid "Server Status"
+msgstr "Estado servidor"
+
+#. module: smtpclient
+#: field:email.smtpclient,verify_email:0
+msgid "Verify Message"
+msgstr "Verificar mensaje"
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_testemail
+msgid "Send Test Email"
+msgstr "Enviar Email de prueba"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__code__ for Verification Code"
+msgstr "__code__ para código de verificación"
+
+#. module: smtpclient
+#: field:email.smtpclient,user:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,date_create:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Default"
+msgstr "Por defecto"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Permission Error!"
+msgstr "¡Error de los permisos!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server Error!"
+msgstr "¡Error del servidor!"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error!"
+msgstr "¡Error del servidor SMTP!"
+
+#. module: smtpclient
+#: field:email.smtpclient,history_line:0
+#: field:report.smtp.server,history:0
+#: view:email.smtpclient:0
+msgid "History"
+msgstr "Historial"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Verification Message. This is the code\n\n__code__\n\nyou must copy in the OpenERP Email Server (Verify Server wizard).\n\nCreated by user __user__"
+msgstr "Mensaje de verificación. Éste es el código\n\n__code__\n\nque deberá copiar en el servidor de Email de OpenERP (asistente Verificar servidor).\n\nCreado por el usuario __user__"
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Server Information"
+msgstr "Información del servidor"
+
+#. module: smtpclient
+#: wizard_button:email.sendcode,init,end:0
+#: wizard_button:email.testemail,init,end:0
+#: wizard_button:email.verifycode,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,resource_id:0
+msgid "Resource ID"
+msgstr "ID del registro"
+
+#. module: smtpclient
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter especial!"
+
+#. module: smtpclient
+#: field:email.smtpclient,from:0
+msgid "Email From"
+msgstr "Remitente Email"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Information"
+msgstr "Información de verificación"
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Stock"
+msgstr "Stock"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: smtpclient
+#: wizard_field:email.verifycode,init,code:0
+#: field:email.smtpclient,code:0
+msgid "Verification Code"
+msgstr "Código de verificación"
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Delivery"
+msgstr "Envío"
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Waiting for Verification"
+msgstr "Esperando verificación"
+
+#. module: smtpclient
+#: field:email.smtpclient,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: smtpclient
+#: field:email.smtpclient,users_id:0
+msgid "Users Allowed"
+msgstr "Usuarios permitidos"
+
+#. module: smtpclient
+#: wizard_field:email.sendcode,init,emailto:0
+#: wizard_field:email.testemail,init,emailto:0
+#: field:email.smtpclient,email:0
+#: field:res.company.address,email:0
+#: view:res.company:0
+msgid "Email Address"
+msgstr "Dirección de correo"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: smtpclient
+#: field:res.company.address,name:0
+msgid "Address Type"
+msgstr "Tipo de dirección"
+
+#. module: smtpclient
+#: field:email.smtpclient.history,model:0
+#: field:report.smtp.server,model:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_tree
+msgid "Email Server"
+msgstr "Servidor Email"
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Report name and Resources ids are required!"
+msgstr "¡Nombre de informe y ids de registros son necesarios!"
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__name__ for Customer Name"
+msgstr "__name__ para nombre de cliente"
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_res_company_address
+msgid "res.company.address"
+msgstr "res.company.address"
+
diff --git a/addons/smtpclient/i18n/fr.po b/addons/smtpclient/i18n/fr.po
new file mode 100644
index 00000000000..59083df5805
--- /dev/null
+++ b/addons/smtpclient/i18n/fr.po
@@ -0,0 +1,840 @@
+# French 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 06:00+0000\n"
+"PO-Revision-Date: 2010-04-07 13:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-13 03:42+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,bcc:0
+msgid "BCC to"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__number__ for Invoice / Sales Number"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,ssl:0
+msgid "Use SSL?"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Start Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_verifycode
+msgid "Verify Server"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.sendcode,init,emailto:0
+msgid "Enter the address Email where you want to get the Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Other Mail Servers"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,to:0
+msgid "Mail to"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Message Error!"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,header_ids:0
+msgid "Default Headers"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_button:email.testemail,init,send:0
+msgid "Send Email"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company.address,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Server already verified!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#, python-format
+msgid "Verification Failed. Please check the Server Configuration!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error!"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,auth_type:0
+#: field:email.smtpclient,type:0
+msgid "Server Type"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,from_email:0
+msgid "Email From"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "User Information"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP SMTP server Email Registration Code!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_report_smtp_server
+#: view:report.smtp.server:0
+msgid "Server Statistics"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Messages"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Sale"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,value:0
+msgid "Value"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Access Permission"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_headers
+msgid "Email Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue:0
+msgid "Queue Option"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please configure Email Server Messages [Verification / Test]"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Verification failed. Invalid Verification Code!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_history
+msgid "Email History"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.history:0
+msgid "Server History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Yahoo!!! Server"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,test_email:0
+msgid "Test Message"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,server_id:0
+msgid "Server ID"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,delete_queue_period:0
+msgid "delete emails/contents from email queue after specified no of days"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,no:0
+msgid "Total No."
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,process_id:0
+msgid "Mail Transport Agent Process"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__user__ for User Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,date_create:0
+msgid "Date Create"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,state:0
+msgid "Server Status"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,error:0
+msgid "Last Error"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.sendcode,init:0
+#: wizard_button:email.sendcode,init,send:0
+msgid "Send Code"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Read Error!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Unable to read Server Settings"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,server_statistics:0
+msgid "Statistics"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.testemail,init:0
+msgid "Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,server_id:0
+msgid "Smtp Server"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company,addresses:0
+msgid "Email Addresses"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_history_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server_history
+msgid "Email Server History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.testemail,init,emailto:0
+msgid "Enter the address Email where you want to get the Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Not Verified"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,email:0
+msgid "Email"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,user_id:0
+msgid "Username"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company.address,name:0
+msgid "Address Type"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Permission"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Message with All Headers"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Message Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Other Information"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Configuration"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,disclaimers:0
+msgid "Disclaimers"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,name:0
+msgid "Server"
+msgstr ""
+
+#. module: smtpclient
+#: view:res.company:0
+msgid "SMTP Settings"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,body:0
+msgid ""
+"The message text that will be send along with the email which is send "
+"through this server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_testemail
+msgid "Send Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_queue
+msgid "Email Queue"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Server Information"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.verifycode,init,code:0
+msgid "Enter the verification code thay you get in your verification Email"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_history
+msgid "Email Client History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Never Delete Message"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP Test Email!"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,body:0
+#: view:email.smtpclient.queue:0
+#: field:email.smtpclient.queue,serialized_message:0
+msgid "Message"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,process_id:0
+msgid "MTA Process"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,server_id:0
+#: view:email.smtpclient:0
+#: field:email.smtpclient,server:0
+#: field:email.smtpclient.queue,server_id:0
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server
+msgid "SMTP Server"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Google Server"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Verified"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,priority:0
+msgid ""
+"Priority between 0 to 10, will be used to define the MTA process priotiry"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,port:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Email TO Address not Defined !"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,auth:0
+msgid "Use Auth"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,pstate:0
+msgid "Server Statue"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,user:0
+msgid "User Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,verify_email:0
+msgid "Verify Message"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient
+#: model:ir.module.module,shortdesc:smtpclient.module_meta_information
+msgid "Email Client"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Disclaimers Message"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__code__ for Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Queued"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,date_create:0
+#: field:email.smtpclient.queue,date_create:0
+msgid "Date"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,cc:0
+msgid "CC to"
+msgstr ""
+
+#. module: smtpclient
+#: model:email.smtpclient,verify_email:smtpclient.email_smtpclient_sendmailserver0
+msgid ""
+"Verification Message. This is the code\n"
+"__code__ \n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"Created by user __user__"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_queue_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server_queue
+msgid "Message Queue"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Default"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete Content After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "You have no permission to access SMTP Server : %s "
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,active:0
+msgid "Active"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_queue
+msgid "Message Queus"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#: view:email.smtpclient.queue:0
+#: selection:email.smtpclient.queue,state:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server Error!"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Clear All After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid ""
+"Please verify Email Server, without verification you can not send Email(s)."
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,history_line:0
+#: field:report.smtp.server,history:0
+msgid "History"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,priority:0
+msgid "Message Priority"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,file_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__name__ for Customer Name"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "General"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,key:0
+msgid "Header"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid ""
+"Verification Message. This is the code\n"
+"\n"
+"__code__\n"
+"\n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"\n"
+"Created by user __user__"
+msgstr ""
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Invoice"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.verifycode,init:0
+#: wizard_button:email.verifycode,init,check:0
+msgid "Verify Code"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_button:email.sendcode,init,end:0
+#: wizard_button:email.testemail,init,end:0
+#: wizard_button:email.verifycode,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue_period:0
+msgid "Delete after"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server is not Verified, Please Verify the Server !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,resource_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Data Error !"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete when Email Sent"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Account"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.module.module,description:smtpclient.module_meta_information
+msgid ""
+"Email Client module that provides:\n"
+"    Sending Email\n"
+"    Use Multiple Server\n"
+"    Multi Threading\n"
+"    Multi Attachment\n"
+"    "
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Stock"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,name:0
+msgid "Description"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,code:0
+#: wizard_field:email.verifycode,init,code:0
+msgid "Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Stop"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,body:0
+msgid "Email Text"
+msgstr ""
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Delivery"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Running"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Last Error occured"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Waiting for Verification"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,password:0
+msgid "Password"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,users_id:0
+msgid "Users Allowed"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#, python-format
+msgid "Verification Code Already Generated !"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_field:email.sendcode,init,emailto:0
+#: field:email.smtpclient,email:0
+#: wizard_field:email.testemail,init,emailto:0
+#: view:res.company:0
+#: field:res.company.address,email:0
+msgid "Email Address"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Message"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Stop Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server
+msgid "Email Servers"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_sendcode
+msgid "Send Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,model:0
+msgid "Model"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_tree
+#: field:ir.actions.server,email_server:0
+msgid "Email Server"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Permission Error!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_res_company_address
+msgid "res.company.address"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,state:0
+msgid "Message Status"
+msgstr ""
diff --git a/addons/smtpclient/i18n/fr_BE.po b/addons/smtpclient/i18n/fr_BE.po
new file mode 100644
index 00000000000..79723798379
--- /dev/null
+++ b/addons/smtpclient/i18n/fr_BE.po
@@ -0,0 +1,825 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* smtpclient
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 06:00:34+0000\n"
+"PO-Revision-Date: 2009-11-26 06:00:34+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,bcc:0
+msgid "BCC to"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__number__ for Invoice / Sales Number"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,ssl:0
+msgid "Use SSL?"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Start Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_verifycode
+msgid "Verify Server"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.sendcode,init,emailto:0
+msgid "Enter the address Email where you want to get the Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Other Mail Servers"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,to:0
+msgid "Mail to"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Message Error!"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,header_ids:0
+msgid "Default Headers"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_button:email.testemail,init,send:0
+msgid "Send Email"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company.address,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Server already verified!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#, python-format
+msgid "Verification Failed. Please check the Server Configuration!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error!"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,auth_type:0
+#: field:email.smtpclient,type:0
+msgid "Server Type"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,from_email:0
+msgid "Email From"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "User Information"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP SMTP server Email Registration Code!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_report_smtp_server
+#: view:report.smtp.server:0
+msgid "Server Statistics"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Messages"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Sale"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,value:0
+msgid "Value"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Access Permission"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_headers
+msgid "Email Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue:0
+msgid "Queue Option"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please configure Email Server Messages [Verification / Test]"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Verification failed. Invalid Verification Code!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_history
+msgid "Email History"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.history:0
+msgid "Server History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Yahoo!!! Server"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,test_email:0
+msgid "Test Message"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,server_id:0
+msgid "Server ID"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,delete_queue_period:0
+msgid "delete emails/contents from email queue after specified no of days"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,no:0
+msgid "Total No."
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,process_id:0
+msgid "Mail Transport Agent Process"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__user__ for User Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,date_create:0
+msgid "Date Create"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,state:0
+msgid "Server Status"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,error:0
+msgid "Last Error"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.sendcode,init:0
+#: wizard_button:email.sendcode,init,send:0
+msgid "Send Code"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Read Error!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Unable to read Server Settings"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,server_statistics:0
+msgid "Statistics"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.testemail,init:0
+msgid "Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,server_id:0
+msgid "Smtp Server"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company,addresses:0
+msgid "Email Addresses"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_history_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server_history
+msgid "Email Server History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.testemail,init,emailto:0
+msgid "Enter the address Email where you want to get the Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Not Verified"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,email:0
+msgid "Email"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,user_id:0
+msgid "Username"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company.address,name:0
+msgid "Address Type"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Permission"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Message with All Headers"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Message Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Other Information"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Configuration"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,disclaimers:0
+msgid "Disclaimers"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,name:0
+msgid "Server"
+msgstr ""
+
+#. module: smtpclient
+#: view:res.company:0
+msgid "SMTP Settings"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,body:0
+msgid "The message text that will be send along with the email which is send through this server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_testemail
+msgid "Send Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_queue
+msgid "Email Queue"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Server Information"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.verifycode,init,code:0
+msgid "Enter the verification code thay you get in your verification Email"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_history
+msgid "Email Client History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Never Delete Message"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP Test Email!"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,body:0
+#: view:email.smtpclient.queue:0
+#: field:email.smtpclient.queue,serialized_message:0
+msgid "Message"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,process_id:0
+msgid "MTA Process"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,server_id:0
+#: view:email.smtpclient:0
+#: field:email.smtpclient,server:0
+#: field:email.smtpclient.queue,server_id:0
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server
+msgid "SMTP Server"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Google Server"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Verified"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,priority:0
+msgid "Priority between 0 to 10, will be used to define the MTA process priotiry"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,port:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Email TO Address not Defined !"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,auth:0
+msgid "Use Auth"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,pstate:0
+msgid "Server Statue"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,user:0
+msgid "User Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,verify_email:0
+msgid "Verify Message"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient
+#: model:ir.module.module,shortdesc:smtpclient.module_meta_information
+msgid "Email Client"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Disclaimers Message"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__code__ for Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Queued"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,date_create:0
+#: field:email.smtpclient.queue,date_create:0
+msgid "Date"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,cc:0
+msgid "CC to"
+msgstr ""
+
+#. module: smtpclient
+#: model:email.smtpclient,verify_email:smtpclient.email_smtpclient_sendmailserver0
+msgid "Verification Message. This is the code\n"
+"__code__ \n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"Created by user __user__"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_queue_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server_queue
+msgid "Message Queue"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Default"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete Content After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "You have no permission to access SMTP Server : %s "
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,active:0
+msgid "Active"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_queue
+msgid "Message Queus"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#: view:email.smtpclient.queue:0
+#: selection:email.smtpclient.queue,state:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server Error!"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Clear All After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please verify Email Server, without verification you can not send Email(s)."
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,history_line:0
+#: field:report.smtp.server,history:0
+msgid "History"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,priority:0
+msgid "Message Priority"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,file_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__name__ for Customer Name"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "General"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,key:0
+msgid "Header"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Verification Message. This is the code\n\n__code__\n\nyou must copy in the OpenERP Email Server (Verify Server wizard).\n\nCreated by user __user__"
+msgstr ""
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Invoice"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.verifycode,init:0
+#: wizard_button:email.verifycode,init,check:0
+msgid "Verify Code"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_button:email.sendcode,init,end:0
+#: wizard_button:email.testemail,init,end:0
+#: wizard_button:email.verifycode,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue_period:0
+msgid "Delete after"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server is not Verified, Please Verify the Server !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,resource_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Data Error !"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete when Email Sent"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Account"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.module.module,description:smtpclient.module_meta_information
+msgid "Email Client module that provides:\n"
+"    Sending Email\n"
+"    Use Multiple Server\n"
+"    Multi Threading\n"
+"    Multi Attachment\n"
+"    "
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Stock"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,name:0
+msgid "Description"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,code:0
+#: wizard_field:email.verifycode,init,code:0
+msgid "Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Stop"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,body:0
+msgid "Email Text"
+msgstr ""
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Delivery"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Running"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Last Error occured"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Waiting for Verification"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,password:0
+msgid "Password"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,users_id:0
+msgid "Users Allowed"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#, python-format
+msgid "Verification Code Already Generated !"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_field:email.sendcode,init,emailto:0
+#: field:email.smtpclient,email:0
+#: wizard_field:email.testemail,init,emailto:0
+#: view:res.company:0
+#: field:res.company.address,email:0
+msgid "Email Address"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Message"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Stop Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server
+msgid "Email Servers"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_sendcode
+msgid "Send Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,model:0
+msgid "Model"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_tree
+#: field:ir.actions.server,email_server:0
+msgid "Email Server"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Permission Error!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_res_company_address
+msgid "res.company.address"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,state:0
+msgid "Message Status"
+msgstr ""
+
diff --git a/addons/smtpclient/i18n/smtpclient.pot b/addons/smtpclient/i18n/smtpclient.pot
new file mode 100644
index 00000000000..79723798379
--- /dev/null
+++ b/addons/smtpclient/i18n/smtpclient.pot
@@ -0,0 +1,825 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* smtpclient
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 06:00:34+0000\n"
+"PO-Revision-Date: 2009-11-26 06:00:34+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,bcc:0
+msgid "BCC to"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__number__ for Invoice / Sales Number"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,ssl:0
+msgid "Use SSL?"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Start Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_verifycode
+msgid "Verify Server"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.sendcode,init,emailto:0
+msgid "Enter the address Email where you want to get the Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Other Mail Servers"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,to:0
+msgid "Mail to"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Message Error!"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,header_ids:0
+msgid "Default Headers"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_button:email.testemail,init,send:0
+msgid "Send Email"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company.address,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Server already verified!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#, python-format
+msgid "Verification Failed. Please check the Server Configuration!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error!"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,auth_type:0
+#: field:email.smtpclient,type:0
+msgid "Server Type"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,from_email:0
+msgid "Email From"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "User Information"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP SMTP server Email Registration Code!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_report_smtp_server
+#: view:report.smtp.server:0
+msgid "Server Statistics"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Messages"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Sale"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,value:0
+msgid "Value"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Access Permission"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_headers
+msgid "Email Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue:0
+msgid "Queue Option"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please configure Email Server Messages [Verification / Test]"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#, python-format
+msgid "Verification failed. Invalid Verification Code!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_history
+msgid "Email History"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.history:0
+msgid "Server History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Yahoo!!! Server"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,test_email:0
+msgid "Test Message"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,server_id:0
+msgid "Server ID"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,delete_queue_period:0
+msgid "delete emails/contents from email queue after specified no of days"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,no:0
+msgid "Total No."
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,process_id:0
+msgid "Mail Transport Agent Process"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__user__ for User Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,date_create:0
+msgid "Date Create"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,state:0
+msgid "Server Status"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,error:0
+msgid "Last Error"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.sendcode,init:0
+#: wizard_button:email.sendcode,init,send:0
+msgid "Send Code"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Read Error!"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Unable to read Server Settings"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,server_statistics:0
+msgid "Statistics"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.testemail,init:0
+msgid "Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,server_id:0
+msgid "Smtp Server"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company,addresses:0
+msgid "Email Addresses"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_history_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server_history
+msgid "Email Server History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.testemail,init,emailto:0
+msgid "Enter the address Email where you want to get the Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Not Verified"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,email:0
+msgid "Email"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,user_id:0
+msgid "Username"
+msgstr ""
+
+#. module: smtpclient
+#: field:res.company.address,name:0
+msgid "Address Type"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Permission"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Message with All Headers"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Message Headers"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,report_id:0
+msgid "Report"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Other Information"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Configuration"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,disclaimers:0
+msgid "Disclaimers"
+msgstr ""
+
+#. module: smtpclient
+#: field:report.smtp.server,name:0
+msgid "Server"
+msgstr ""
+
+#. module: smtpclient
+#: view:res.company:0
+msgid "SMTP Settings"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,body:0
+msgid "The message text that will be send along with the email which is send through this server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_testemail
+msgid "Send Test Email"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_queue
+msgid "Email Queue"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Server Information"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.verifycode,init,code:0
+msgid "Enter the verification code thay you get in your verification Email"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient_history
+msgid "Email Client History"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Never Delete Message"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "OpenERP Test Email!"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+#: field:email.smtpclient,body:0
+#: view:email.smtpclient.queue:0
+#: field:email.smtpclient.queue,serialized_message:0
+msgid "Message"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,process_id:0
+msgid "MTA Process"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,server_id:0
+#: view:email.smtpclient:0
+#: field:email.smtpclient,server:0
+#: field:email.smtpclient.queue,server_id:0
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server
+msgid "SMTP Server"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,auth_type:0
+msgid "Google Server"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Verified"
+msgstr ""
+
+#. module: smtpclient
+#: help:email.smtpclient,priority:0
+msgid "Priority between 0 to 10, will be used to define the MTA process priotiry"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,port:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Email TO Address not Defined !"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Server Error !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,auth:0
+msgid "Use Auth"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,pstate:0
+msgid "Server Statue"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,user:0
+msgid "User Name"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,verify_email:0
+msgid "Verify Message"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_email_smtpclient
+#: model:ir.module.module,shortdesc:smtpclient.module_meta_information
+msgid "Email Client"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Disclaimers Message"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__code__ for Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient.queue,state:0
+msgid "Queued"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,date_create:0
+#: field:email.smtpclient.queue,date_create:0
+msgid "Date"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,cc:0
+msgid "CC to"
+msgstr ""
+
+#. module: smtpclient
+#: model:email.smtpclient,verify_email:smtpclient.email_smtpclient_sendmailserver0
+msgid "Verification Message. This is the code\n"
+"__code__ \n"
+"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
+"Created by user __user__"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_queue_tree
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server_queue
+msgid "Message Queue"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+#: selection:res.company.address,name:0
+msgid "Default"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete Content After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "You have no permission to access SMTP Server : %s "
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,active:0
+msgid "Active"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_queue
+msgid "Message Queus"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#: code:addons/smtpclient/wizard/testemail.py:0
+#: code:addons/smtpclient/wizard/verifycode.py:0
+#: view:email.smtpclient.queue:0
+#: selection:email.smtpclient.queue,state:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server Error!"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Clear All After"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Please verify Email Server, without verification you can not send Email(s)."
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,history_line:0
+#: field:report.smtp.server,history:0
+msgid "History"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,priority:0
+msgid "Message Priority"
+msgstr ""
+
+#. module: smtpclient
+#: field:ir.actions.server,file_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "__name__ for Customer Name"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "General"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.headers,key:0
+msgid "Header"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Verification Message. This is the code\n\n__code__\n\nyou must copy in the OpenERP Email Server (Verify Server wizard).\n\nCreated by user __user__"
+msgstr ""
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Invoice"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_view:email.verifycode,init:0
+#: wizard_button:email.verifycode,init,check:0
+msgid "Verify Code"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_button:email.sendcode,init,end:0
+#: wizard_button:email.testemail,init,end:0
+#: wizard_button:email.verifycode,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,delete_queue_period:0
+msgid "Delete after"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Server is not Verified, Please Verify the Server !"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,resource_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "SMTP Data Error !"
+msgstr ""
+
+#. module: smtpclient
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,delete_queue:0
+msgid "Delete when Email Sent"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Account"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.module.module,description:smtpclient.module_meta_information
+msgid "Email Client module that provides:\n"
+"    Sending Email\n"
+"    Use Multiple Server\n"
+"    Multi Threading\n"
+"    Multi Attachment\n"
+"    "
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,type:0
+msgid "Stock"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,name:0
+msgid "Description"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,code:0
+#: wizard_field:email.verifycode,init,code:0
+msgid "Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Stop"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,body:0
+msgid "Email Text"
+msgstr ""
+
+#. module: smtpclient
+#: selection:res.company.address,name:0
+msgid "Delivery"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,pstate:0
+msgid "Running"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient.queue:0
+msgid "Last Error occured"
+msgstr ""
+
+#. module: smtpclient
+#: selection:email.smtpclient,state:0
+msgid "Waiting for Verification"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,password:0
+msgid "Password"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient,users_id:0
+msgid "Users Allowed"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/wizard/sendcode.py:0
+#, python-format
+msgid "Verification Code Already Generated !"
+msgstr ""
+
+#. module: smtpclient
+#: wizard_field:email.sendcode,init,emailto:0
+#: field:email.smtpclient,email:0
+#: wizard_field:email.testemail,init,emailto:0
+#: view:res.company:0
+#: field:res.company.address,email:0
+msgid "Email Address"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Verification Message"
+msgstr ""
+
+#. module: smtpclient
+#: view:email.smtpclient:0
+msgid "Stop Server"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server
+msgid "Email Servers"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.wizard,name:smtpclient.wizard_email_sendcode
+msgid "Send Verification Code"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.history,model:0
+msgid "Model"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_tree
+#: field:ir.actions.server,email_server:0
+msgid "Email Server"
+msgstr ""
+
+#. module: smtpclient
+#: code:addons/smtpclient/smtpclient.py:0
+#, python-format
+msgid "Permission Error!"
+msgstr ""
+
+#. module: smtpclient
+#: model:ir.model,name:smtpclient.model_res_company_address
+msgid "res.company.address"
+msgstr ""
+
+#. module: smtpclient
+#: field:email.smtpclient.queue,state:0
+msgid "Message Status"
+msgstr ""
+
diff --git a/addons/purchase_manual/__terp__.py b/addons/smtpclient/ir_model.py
similarity index 58%
rename from addons/purchase_manual/__terp__.py
rename to addons/smtpclient/ir_model.py
index a0c140cbcc2..1cc422cf67a 100644
--- a/addons/purchase_manual/__terp__.py
+++ b/addons/smtpclient/ir_model.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,24 +18,22 @@
 #
 ##############################################################################
 
+from osv import fields,osv
 
-{
-    'name': 'Purchase Management - Manual Control of Invoice',
-    'version': '1.1',
-    'category': 'Generic Modules/Sales & Purchases',
-    'description': """Module for purchase management, manual control of invoice""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['purchase'],
-    'init_xml': [],
-    'update_xml': [
-        'purchase_manual_view.xml',
-        'wizard/purchase_line_invoice_view.xml',
-        
-    ],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-#    'certificate': False,
-}
+class EmailAddress(osv.osv):
+    _name = "res.company.address"
+    _columns = {
+        'company_id' : fields.many2one('res.company', 'Company' , required=True),
+        'email': fields.many2one('email.smtpclient', 'Email Address',  required=True),
+        'name' : fields.selection([("default", "Default"),("invoice", "Invoice"),("sale","Sale"),("delivery","Delivery")], "Address Type",required=True)
+    }
+EmailAddress()
+
+class Company(osv.osv):
+    _inherit = "res.company"
+    _columns = {
+        'addresses': fields.one2many('res.company.address', 'company_id', 'Email Addresses'),
+    }
+Company()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/smtpclient/security/ir.model.access.csv b/addons/smtpclient/security/ir.model.access.csv
new file mode 100644
index 00000000000..6b5df447317
--- /dev/null
+++ b/addons/smtpclient/security/ir.model.access.csv
@@ -0,0 +1,11 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_smtpclient_all","smtpclient all","model_email_smtpclient",,1,0,0,0
+"access_smtpclient_group_erpmanager","smtpclient erp_manager","model_email_smtpclient","base.group_erp_manager",1,1,1,1
+"access_smtpclient_history_all","smtpclient_history all","model_email_smtpclient_history",,1,0,0,0
+"access_smtpclient_history_group_erpmanager","smtpclient_history erp_manager","model_email_smtpclient_history","base.group_erp_manager",1,1,1,1
+"access_smtpclient_report_all","smtpclient_report all","model_report_smtp_server",,1,0,0,0
+"access_smtpclient_report_group_erpmanager","smtpclient_report erp_manager","model_report_smtp_server","base.group_erp_manager",1,1,1,1
+"access_res_company_address","res.company.address","model_res_company_address",,1,0,0,0
+"access_res_company_address_erpmanager","res.company.address","model_res_company_address","base.group_erp_manager",1,1,1,1
+"access_email_smtpclient_queue","Smtpclient_queue all","model_email_smtpclient_queue",,1,1,1,0
+"access_email_smtpclient_queue_erpmanager","Smtpclient_queue erp_manager","model_email_smtpclient_queue","base.group_erp_manager",1,1,1,1
diff --git a/addons/smtpclient/serveraction.py b/addons/smtpclient/serveraction.py
new file mode 100644
index 00000000000..fe2010a760f
--- /dev/null
+++ b/addons/smtpclient/serveraction.py
@@ -0,0 +1,107 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import netsvc
+import time
+
+class email_headers(osv.osv):
+    _inherit = 'email.headers'
+    _columns = {
+        'action_id':fields.many2one('ir.actions.server', 'Server Action'),
+    }
+email_headers()
+
+class server_action(osv.osv):
+    _inherit = 'ir.actions.server'
+    _description = 'Email Client'
+    _columns = {
+        'email_server':fields.many2one('email.smtpclient', 'Email Server'),
+        'report_id':fields.many2one('ir.actions.report.xml', 'Report', required=False),
+        'file_ids':fields.many2many('ir.attachment', 'serveraction_attachment_rel', 'action_id', 'file_id', 'Attachments'),
+        'header_ids':fields.one2many('email.headers', 'action_id', 'Default Headers'),
+    }
+    
+    def run(self, cr, uid, ids, context={}):
+        logger = netsvc.Logger()
+        
+        act_ids = []
+        
+        for action in self.browse(cr, uid, ids, context):
+            obj_pool = self.pool.get(action.model_id.model)
+            obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
+            cxt = {
+                'context':context, 
+                'object': obj, 
+                'time':time,
+                'cr': cr,
+                'pool' : self.pool,
+                'uid' : uid
+            }
+            expr = eval(str(action.condition), cxt)
+            if not expr:
+                continue
+
+            if action.state == 'email':                
+                address = str(action.email)
+                try:
+                    address =  eval(str(action.email), cxt)
+                except:
+                    pass
+
+                if not address:
+                    logger.notifyChannel('email', netsvc.LOG_INFO, 'Partner Email address not Specified!')
+                    continue
+
+                subject = self.merge_message(cr, uid, action.subject, action, context)
+                body = self.merge_message(cr, uid, action.message, action, context)
+                smtp_pool = self.pool.get('email.smtpclient')
+
+                reports = []
+                if action.report_id:
+                    reports.append(('report.'+action.report_id.report_name, [context['active_id']]))
+                
+                ir_attach_ids = []
+                if action.file_ids:
+                    for ir_file in action.file_ids:
+                        ir_attach_ids.append(ir_file.id)
+                
+                headers = { }
+                for key in action.header_ids:
+                    val = eval(key.value, cxt)
+                    headers[key.key] = val
+                
+                context['headers'] = headers
+                
+                if smtp_pool.send_email(cr, uid, action.email_server.id, address, subject, body, [], reports=reports, ir_attach=ir_attach_ids, context=context) == True:
+                    logger.notifyChannel('smtp', netsvc.LOG_INFO, 'Email successfully send to : %s' % (address))
+                else:
+                    logger.notifyChannel('smtp', netsvc.LOG_ERROR, 'Failed to send email to : %s' % (address))
+
+            else:
+                act_ids.append(action.id)
+        
+        if act_ids:
+            return super(server_action,self).run(cr, uid, act_ids, context)
+        else:
+            return False
+
+server_action()
diff --git a/addons/smtpclient/serveraction_view.xml b/addons/smtpclient/serveraction_view.xml
new file mode 100644
index 00000000000..b8e5d65a8cc
--- /dev/null
+++ b/addons/smtpclient/serveraction_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    
+        <record model="ir.ui.view" id="view_server_report_inherit">
+            <field name="name">ir.actions.server.form.inherit</field>
+            <field name="model">ir.actions.server</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_server_action_form"/>
+            <field name="arch" type="xml">
+                <field name="email" position="after">
+                    <field name="email_server" select="1" attrs="{'required':[('state','=','email')]}"/>
+                    <field name="report_id"/>
+                </field>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_server_attachment_inherit">
+            <field name="name">ir.actions.server.form.inherit</field>
+            <field name="model">ir.actions.server</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_server_report_inherit"/>
+            <field name="arch" type="xml">
+                <field name="message" position="after">
+                    <group colspan="2" col="2">
+                        <separator string="Attachments" colspan="2"/>
+                        <field name="file_ids" colspan="2" nolabel="1"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Headers" colspan="2"/>
+                        <field name="header_ids" colspan="2" nolabel="1">
+                            <tree string="Custom Headers" editable="top">
+                                <field name="key"/>
+                                <field name="value"/>
+                            </tree>
+                        </field>
+                    </group>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/smtpclient/smtpclient.py b/addons/smtpclient/smtpclient.py
new file mode 100644
index 00000000000..3cb6c4854c0
--- /dev/null
+++ b/addons/smtpclient/smtpclient.py
@@ -0,0 +1,675 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import os
+import sys
+import bz2
+
+import time
+from datetime import datetime
+from datetime import timedelta
+
+import release
+import socket
+
+import base64
+import binascii
+
+import random
+import smtplib
+import mimetypes
+
+from email import Encoders
+from optparse import OptionParser
+from email.Message import Message
+from email.MIMEBase import MIMEBase
+from email.MIMEText import MIMEText
+from email.MIMEMultipart import MIMEMultipart
+from email.Utils import COMMASPACE, formatdate
+
+import netsvc
+import pooler
+import tools
+
+from osv import fields
+from osv import osv
+from tools.translate import _
+
+error_msg = {
+    'not_active' : "Please activate Email Server, without activating you can not send Email(s).",
+    'server_stop' : 'Please start Email Server, without starting  you can not send Email(s).',
+    'server_not_confirm' : 'Please Verify Email Server, without verifying you can not send Email(s).'
+}
+
+logger = netsvc.Logger()
+
+class smtpclient(osv.osv):
+
+    _name = 'email.smtpclient'
+    _description = 'Email Client'
+    
+    _columns = {
+        'name' : fields.char('Server Name', size=256, required=True),
+        'from_email' : fields.char('Email From', size=256),
+        'email' : fields.char('Email Address', size=256, required=True, readonly=True, states={'new':[('readonly',False)]}),
+        'user' : fields.char('User Name', size=256, readonly=True, states={'new':[('readonly',False)]}),
+        'password' : fields.char('Password', size=1024, invisible=True, readonly=True, states={'new':[('readonly',False)]}),
+        'server' : fields.char('SMTP Server', size=256, required=True, readonly=True, states={'new':[('readonly',False)]}),
+        'auth' : fields.boolean("Use Auth", readonly=True, states={'new':[('readonly',False)]}),
+        'port' : fields.char('SMTP Port', size=256, required=True, readonly=True, states={'new':[('readonly',False)]}),
+        'ssl' : fields.boolean("Use SSL?", readonly=True, states={'new':[('readonly',False)]}),
+        'users_id': fields.many2many('res.users', 'res_smtpserver_group_rel', 'sid', 'uid', 'Users Allowed'),
+        'state': fields.selection([
+            ('new','Not Verified'),
+            ('waiting','Waiting for Verification'),
+            ('confirm','Verified'),
+        ],'Server Status', select=True, readonly=True),
+        'auth_type':fields.selection([('gmail','Google Server'), ('yahoo','Yahoo!!! Server'), ('unknown','Other Mail Servers')], string="Server Type", readonly=True, states={'new':[('readonly',False)]}),
+        'active' : fields.boolean("Active"),
+        'date_create': fields.date('Date Create', required=True, readonly=True),
+        'test_email' : fields.text('Test Message', translate=True),
+        'body' : fields.text('Message', translate=True, help="The message text that will be send along with the email which is send through this server"),
+        'verify_email' : fields.text('Verify Message', translate=True, readonly=True, states={'new':[('readonly',False)]}),
+        'code' : fields.char('Verification Code', size=1024),
+        'type' : fields.selection([("default", "Default"),("account", "Account"),("sale","Sale"),("stock","Stock")], "Server Type",required=True),
+        'history_line': fields.one2many('email.smtpclient.history', 'server_id', 'History'),
+        'server_statistics': fields.one2many('report.smtp.server', 'server_id', 'Statistics'),
+        'delete_queue': fields.selection([
+            ('never','Never Delete Message'),
+            ('content','Delete Content After'),
+            ('all','Clear All After'),
+            ('after_send','Delete when Email Sent'),
+        ],'Queue Option', select=True),
+        'priority': fields.integer('Server Priority', readonly=True, states={'new':[('readonly',False)]}, help="Priority between 0 to 10, will be used to define the MTA process priotiry"),
+        'header_ids':fields.one2many('email.headers', 'server_id', 'Default Headers'),
+        'disclaimers': fields.text('Disclaimers'),
+        'process_id': fields.many2one('ir.cron', 'MTA Process', readonly=True, help="Mail Transport Agent Process"),
+        'pstate': fields.selection([
+            ('running','Running'),
+            ('stop','Stop'),
+        ],'Server Statue', select=True, readonly=True),
+        'delete_queue_period': fields.integer('Delete after', help="delete emails/contents from email queue after specified no of days"),
+    }
+    
+    def _get_users(self, cr, uid, context={}):
+        return self.pool.get('res.users').search(cr, uid, [])
+    
+    _defaults = {
+        'date_create': lambda *a: time.strftime('%Y-%m-%d'),
+        'state': lambda *a: 'new',
+        'type': lambda *a: 'default',
+        'port': lambda *a: '25',
+        'pstate':lambda *a: 'stop',
+        'priority': lambda *a: 5,
+        'delete_queue_period': lambda *a: 30,
+        'auth': lambda *a: True,
+        'active': lambda *a: True,
+        'delete_queue': lambda *a: 'never',
+        'users_id': _get_users,
+        'verify_email': lambda *a: _("Verification Message. This is the code\n\n__code__\n\nyou must copy in the OpenERP Email Server (Verify Server wizard).\n\nCreated by user __user__"),
+    }
+    
+    server = {}
+    smtpServer = {}
+    
+    def create(self, cr, user, vals, context={}):
+        if vals.get('password', False) != False:
+            vals['password'] = base64.b64encode(vals.get('password'))
+            
+        res_id = super(smtpclient, self).create(cr, user, vals, context)
+        return res_id
+    
+    def write(self, cr, user, ids, vals, context=None):
+        flag = False
+        if vals.get('password', False) != False:
+            for pass_char in vals.get('password'):
+                if pass_char != '*':
+                    flag= True
+                    break
+
+            if flag:    
+                vals['password'] = base64.b64encode(vals.get('password'))
+            else:
+                del vals['password']    
+            
+        res = super(smtpclient, self).write(cr, user, ids, vals, context)
+        return res
+    
+    def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        def override_password(o):
+            if len(o) > 0:
+                for field in o[0]:
+                    if field == 'password':
+                        o[0][field] = '********'
+            return o
+
+        result = super(smtpclient, self).read(cr, uid, ids, fields, context, load)
+        result = override_password(result)
+        return result
+        
+    def change_servertype(self, cr, uid, ids, server):
+        if server == 'gmail':
+            return {'value':{'server':'smtp.gmail.com', 'port':'25', 'ssl':True, 'auth':True}}
+        elif server== 'yahoo':
+            return {'value':{'server':'smtp.mail.yahoo.co.in', 'ssl':False, 'port':'587', 'auth':True}}
+        else:
+            return {'value':{'server':'localhost', 'port':'25', 'ssl':False, 'auth':False}}
+    
+    def change_email(self, cr, uid, ids, email):
+        email_from = self.pool.get('res.users').browse(cr, uid, uid).name
+        if len(email) > 0 and email.find('@') > -1 and email.index('@') > 0:
+            user = email[0:email.index('@')]
+            return {'value':{'user':user, 'from_email':email_from+' <'+email+'>'}}
+        else:
+            return {'value':{'user':email, 'from_email':email_from+' <'+email+'>'}}
+
+    def check_permissions(self, cr, uid, ids):
+        if uid == 1:
+            return True
+        cr.execute('select * from res_smtpserver_group_rel where sid=%s and uid=%s' % (ids[0], uid))
+        data = cr.fetchall()
+        if len(data) <= 0:
+            return False
+
+        return True
+
+    def gen_private_key(self, cr, uid, ids):
+        new_key = []
+        for i in time.strftime('%Y-%m-%d %H:%M:%S'):
+            ky = i
+            if ky in (' ', '-', ':'):
+                keys = random.random()
+                key = str(keys).split('.')[1]
+                ky = key
+
+            new_key.append(ky)
+        new_key.sort()
+        key = ''.join(new_key)
+        return key
+
+    
+    def _set_error(self, cr, uid, server_id, context={}):
+        server_obj = self.browse(cr, uid, server_id)
+        if not server_obj.active:
+            return 'not_active'
+        if server_obj.pstate == 'stop' :
+            return 'server_stop' 
+        if server_obj.state != 'confirm':
+            return 'server_not_confirm'
+        return True
+
+    def test_verify_email(self, cr, uid, ids, toemail, test=False, code=False):
+        
+        serverid = ids[0]
+        self.open_connection(cr, uid, ids, serverid)
+        
+        key = False
+        if test and self.server[serverid]['state'] == 'confirm':
+            body = self.server[serverid]['test_email'] or ''
+        else:
+            body = self.server[serverid]['verify_email'] or ''
+            #ignore the code
+            key = self.gen_private_key(cr, uid, ids)
+            #md5(time.strftime('%Y-%m-%d %H:%M:%S') + toemail).hexdigest();
+                
+            body = body.replace("__code__", key)
+            
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid])[0]
+        body = body.replace("__user__", user.name)
+        
+        if len(body.strip()) <= 0:
+            raise osv.except_osv(_('Message Error!'), _('Please configure Email Server Messages [Verification / Test]'))
+        
+        try:
+            msg = MIMEText(body.encode('utf8') or '',_subtype='plain',_charset='utf-8')
+        except:
+            msg = MIMEText(body or '',_subtype='plain',_charset='utf-8')
+        
+        if not test and not self.server[serverid]['state'] == 'confirm':
+            msg['Subject'] = _('OpenERP SMTP server Email Registration Code!')
+        else:
+            msg['Subject'] = _('OpenERP Test Email!')
+        
+        msg['To'] = toemail
+        msg['From'] = tools.ustr(self.server[serverid]['from_email'])
+        
+        message = msg.as_string()
+        
+        if self.server[serverid]['disclaimers']:
+            body = body + "\n" + self.server[serverid]['disclaimers']
+            
+        queue = pooler.get_pool(cr.dbname).get('email.smtpclient.queue')
+        queue.create(cr, uid, {
+            'to':toemail,
+            'server_id':serverid,
+            'name':msg['Subject'],
+            'body':body,
+            'serialized_message':message,
+            'priority':1,
+            'type':'system'
+        })
+        
+        if self.server[serverid]['state'] != 'confirm':
+            self.write(cr, uid, ids, {'state':'waiting', 'code':key})
+            
+        return True
+         
+    def getpassword(self, cr, uid, ids):
+        data = {}
+        cr.execute("select * from email_smtpclient where id = %s" , (str(ids[0]),))
+        data = cr.dictfetchall()
+        return data
+
+    def open_connection(self, cr, uid, ids, serverid=False, permission=True):
+        if serverid:
+            self.server[serverid] = self.getpassword(cr, uid, [serverid])[0]
+        else:
+            raise osv.except_osv(_('Read Error!'), _('Unable to read Server Settings'))
+        
+        if permission:
+            if not self.check_permissions(cr, uid, [serverid]):
+                raise osv.except_osv(_('Permission Error!'), _('You have no permission to access SMTP Server : %s ') % (self.server[serverid]['name'],) )
+        
+        if self.server[serverid]:
+            try:
+                self.smtpServer[serverid] = smtplib.SMTP()
+                self.smtpServer[serverid].debuglevel = 0
+                self.smtpServer[serverid].connect(str(self.server[serverid]['server']),str(self.server[serverid]['port']))
+                
+                if self.server[serverid]['ssl']:
+                    self.smtpServer[serverid].ehlo()
+                    self.smtpServer[serverid].starttls()
+                    self.smtpServer[serverid].ehlo()
+                    
+                if self.server[serverid]['auth']:
+                    password = self.server[serverid]['password']
+                    password = base64.b64decode(password)
+                    self.smtpServer[serverid].login(str(self.server[serverid]['user']), password)
+
+            except Exception, e:
+                logger.notifyChannel('imap', netsvc.LOG_WARNING, e)
+            
+        return True
+    
+    def selectAddress(self, cr, uid, partner=None, contact=None, ):
+        email = 'none@none.com'
+        if partner is None and contact is None:
+            return 'none@none.com'
+         
+        if partner is not None and contact is None:
+            pool = self.pool.get('res.partner')
+            data = pool.read(cr, uid, [partner])[0]
+            if data:
+                contact = data['address']
+
+        if contact is not None:
+            pool = self.pool.get('res.partner.address')
+            data = pool.read(cr, uid, contact)[0]
+            email = data['email']
+        
+        return email
+    
+    def select(self, cr, uid, type):
+        pool = self.pool.get('email.smtpclient')
+        ids = pool.search(cr, uid, [('type','=',type)], context=False)
+        if not ids:
+            ids = pool.search(cr, uid, [('type','=','default')], context=False)
+        
+        if not ids:
+            return False
+        
+        return ids[0]
+    
+    # Reports is a list of tuples,where first arguement of tuple is the name of the report,second is the list of ids of the object
+    def send_email(self, cr, uid, server_id, emailto, subject, body='', attachments=[], reports=[], ir_attach=[], charset='utf-8', headers={}, context={}):
+        
+        if not emailto:
+            raise osv.except_osv(_('SMTP Data Error !'), _('Email TO Address not Defined !'))
+        
+        def createReport(cr, uid, report, ids, name=False):
+            files = []
+            for id in ids:
+                try:
+                    service = netsvc.LocalService(report)
+                    (result, format) = service.create(cr, uid, [id], {}, {})
+                    if not name:
+                        report_file = '/tmp/reports'+ str(id) + '.pdf'
+                    else:
+                        report_file = name
+                    
+                    fp = open(report_file,'wb+')
+                    fp.write(result);
+                    fp.close();
+                    files += [report_file]    
+                except Exception,e:
+                    continue        
+            return files
+        
+        smtp_server = self.browse(cr, uid, server_id)
+        if smtp_server.state != 'confirm':
+            raise osv.except_osv(_('SMTP Server Error !'), _('Server is not Verified, Please Verify the Server !'))
+        
+        if not subject:
+            subject = "OpenERP Email: [Unknown Subject]"
+            
+        try:
+            subject = subject.encode(charset)
+        except:
+            subject = subject.decode()   
+
+        #attachment from Reports
+        for rpt in reports:
+            if len(rpt) == 3:
+                rpt_file = createReport(cr, uid, rpt[0], rpt[1], rpt[2])
+            elif len(rpt) == 2:
+                rpt_file = createReport(cr, uid, rpt[0], rpt[1])
+            attachments += rpt_file
+        
+        if isinstance(emailto, str) or isinstance(emailto, unicode):
+            emailto = [emailto]
+
+        ir_pool = self.pool.get('ir.attachment')
+        
+        for to in emailto:
+            msg = MIMEMultipart()
+            msg['Subject'] = tools.ustr(subject) 
+            msg['To'] =  to
+            msg['From'] = context.get('email_from', smtp_server.from_email)
+            
+            if body == False:
+                body = ''
+                            
+            if smtp_server.disclaimers:
+                body = body + "\n" + smtp_server.disclaimers
+                
+            try:
+                msg.attach(MIMEText(body.encode(charset) or '', _charset=charset, _subtype="html"))
+            except:
+                msg.attach(MIMEText(body or '', _charset=charset, _subtype="html"))    
+            
+            #add custom headers to email
+            for hk in headers.keys():
+                msg[hk] = headers[hk]
+
+            for hk in smtp_server.header_ids:
+                msg[hk.key] = hk.value
+              
+            context_headers = context.get('headers', [])
+            for hk in context_headers:
+                msg[hk] = context_headers[hk]
+            
+            # Add OpenERP Server information
+            msg['X-Generated-By'] = 'OpenERP (http://www.openerp.com)'
+            msg['X-OpenERP-Server-Host'] = socket.gethostname()
+            msg['X-OpenERP-Server-Version'] = release.version
+            msg['Message-Id'] = "<%s-openerp-@%s>" % (time.time(), socket.gethostname())
+          
+            #attach files from disc
+            for file in attachments:
+                part = MIMEBase('application', "octet-stream")
+                part.set_payload(open(file,"rb").read())
+                Encoders.encode_base64(part)
+                part.add_header('Content-Disposition', 'attachment; filename="%s"' % os.path.basename(file))
+                msg.attach(part)
+            
+            #attach files from ir_attachments
+            for ath in ir_pool.browse(cr, uid, ir_attach):
+                part = MIMEBase('application', "octet-stream")
+                datas = base64.decodestring(ath.datas)
+                part.set_payload(datas)
+                Encoders.encode_base64(part)
+                part.add_header('Content-Disposition', 'attachment; filename="%s"' %(ath.name))
+                msg.attach(part)
+            
+            message = msg.as_string()
+            data = {
+                'to':to,
+                'server_id':server_id,
+                'cc':False,
+                'bcc':False,
+                'name':subject,
+                'body':body,
+                'serialized_message':message,
+                'priority':smtp_server.priority,
+            }
+            self.create_queue_enrty(cr, uid, data, context)
+            
+        return True
+    
+    def create_queue_enrty(self, cr, uid, data, context={}):
+        queue = pooler.get_pool(cr.dbname).get('email.smtpclient.queue')
+        return queue.create(cr, uid, data, context)
+        
+    def _check_history(self, cr, uid, ids=False, context={}):
+        result = True
+        server = self.pool.get('email.smtpclient')
+        queue = self.pool.get('email.smtpclient.queue')
+        sids = self.search(cr, uid, [])
+        for server in self.browse(cr, uid, sids):
+            if server.delete_queue == 'never':
+                continue
+            
+            now = datetime.today()
+            days = timedelta(days=server.delete_queue_period)
+            day = now - days
+            kday = day.__str__().split(' ')[0]
+            
+            if server.delete_queue == 'content':
+                qids = queue.search(cr, uid, [('server_id','=',server.id), ('date_create','<=',kday)])
+                queue.write(cr, uid, qids, {'serialized_message':False})
+                continue
+            
+            if server.delete_queue == 'all':
+                qids = queue.search(cr, uid, [('server_id','=',server.id), ('date_create','<=',kday)])
+                queue.unlink(cr, uid, qids)
+                
+        return result
+    
+    def _send_emails(self, cr, uid, ids, context={}):
+        fp = os.popen('ping www.google.com -c 1 -w 5',"r")
+        if not fp.read():
+            return False
+        
+        queue = self.pool.get('email.smtpclient.queue')
+        history = self.pool.get('email.smtpclient.history')
+        queue.write(cr, uid, ids, {'state':'sending'})
+        
+        error = []
+        sent = []
+        remove = []
+        open_server = []
+        
+        for email in queue.browse(cr, uid, ids):
+            
+            if not email.server_id.id in open_server:
+                open_server.append(email.server_id.id)
+                self.open_connection(cr, uid, ids, email.server_id.id)
+                
+            try:
+                self.smtpServer[email.server_id.id].sendmail(email.server_id.email, email.to, tools.ustr(email.serialized_message))
+                message = "message sent successfully to %s from %s server" % (email.to, email.server_id.name)
+                logger.notifyChannel('smtp', netsvc.LOG_INFO, message)
+            except Exception, e:
+                queue.write(cr, uid, [email.id], {'error':e, 'state':'error'})
+                continue
+            
+            history.create(cr, uid, {
+                'name':email.body,
+                'user_id':uid,
+                'server_id': email.server_id.id,
+                'email':email.to
+            })
+            if email.server_id.delete_queue == 'after_send':
+                remove.append(email.id)
+            else:
+                sent.append(email.id)
+        
+        queue.unlink(cr, uid, remove)
+        queue.write(cr, uid, sent, {'state':'send'})
+        return True
+    
+    def _check_queue(self, cr, uid, ids=False):
+        queue = self.pool.get('email.smtpclient.queue')
+        sids = []
+        if not ids:
+            sids = queue.search(cr, uid, [('state','not in',['send','sending']), ('type','=','system')], order="priority", limit=30)
+            ids =[]
+        else:
+            sids = queue.search(cr, uid, [('state','not in',['send','sending']), ('server_id','in',ids)], order="priority", limit=30)
+        
+        message = ""
+        if len(ids) > 0:
+            message = "sending %s emails from message queuq !" % (len(ids))
+            logger.notifyChannel('smtp', netsvc.LOG_INFO, message)
+        
+        result = self. _send_emails(cr, uid, sids, {})
+        return result
+        
+    def set_to_draft(self, cr, uid, ids, context={}):
+        self.write(cr, uid, ids, {'state':'new', 'code':False})
+        return True
+    
+    def create_process(self, cr, uid, ids, context={}):
+        svr = self.browse(cr, uid, ids[0])
+        if not svr.process_id:
+            res = {
+                'name':'Process : ' + svr.name,
+                'model':'email.smtpclient',
+                'args': repr([ids]), 
+                'function':'_check_queue',
+                'priority':5,
+                'interval_number':1,
+                'interval_type':'minutes',
+                'user_id':uid,
+                'numbercall':-1,
+                'doall':False
+            }
+            id = self.pool.get('ir.cron').create(cr, uid, res)
+            self.write(cr, uid, ids, {'process_id':id})
+        return True
+        
+    def start_process(self, cr, uid, ids, context={}):
+        process = self.browse(cr, uid, ids[0], context)
+        if not process.process_id:
+            raise osv.except_osv(_('SMTP Server Error !'), _('Server is not Verified, Please Verify the Server !'))
+            
+        pid = process.process_id.id
+        self.pool.get('ir.cron').write(cr, uid, [pid], {'active':True})
+        self.write(cr, uid, ids, {'pstate':'running'})
+        return True
+        
+    def stop_process(self, cr, uid, ids, context={}):
+        pid = self.browse(cr, uid, ids[0], context).process_id.id
+        self.pool.get('ir.cron').write(cr, uid, [pid], {'active':False})
+        self.write(cr, uid, ids, {'pstate':'stop'})
+        return True
+
+smtpclient()
+
+class email_headers(osv.osv):
+    _name = 'email.headers'
+    _description = 'Email Headers'
+    _columns = {
+        'server_id':fields.many2one('email.smtpclient', 'SMTP Server'),
+        'key':fields.char('Header', size=64, required=True),
+        'value':fields.char('Value', size=1024, required=False),
+    }
+email_headers()
+
+class email_history(osv.osv):
+    _name = 'email.smtpclient.history'
+    _description = 'Email Client History'
+    _order = 'id desc'
+
+    _columns = {
+        'name' : fields.text('Description',required=True, readonly=True),
+        'date_create': fields.datetime('Date',readonly=True),
+        'user_id':fields.many2one('res.users', 'Username', readonly=True, select=True),
+        'server_id' : fields.many2one('email.smtpclient', 'Smtp Server', ondelete='set null', readonly=True, required=True),
+        'model':fields.many2one('ir.model', 'Model', readonly=True, select=True),
+        'resource_id':fields.integer('Resource ID', readonly=True),
+        'email':fields.char('Email',size=64,readonly=True),
+    }
+    
+    _defaults = {
+        'date_create': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'user_id': lambda obj, cr, uid, context: uid,
+    }
+    
+    def create(self, cr, uid, vals, context=None):
+        super(email_history,self).create(cr, uid, vals, context)
+        cr.commit()
+email_history()
+
+class message_queue(osv.osv):
+    _name = 'email.smtpclient.queue'
+    _description = 'Email Queue'
+    _order = '"to"'
+    _columns = {
+        'to' : fields.char('Mail to', size=1024, readonly=True, states={'draft':[('readonly',False)], 'error':[('readonly',False)]}),
+        'server_id':fields.many2one('email.smtpclient', 'SMTP Server', readonly=True, states={'draft':[('readonly',False)]}),
+        'cc' : fields.char('CC to', size=1024, readonly=True, states={'draft':[('readonly',False)]}),
+        'bcc' : fields.char('BCC to', size=1024, readonly=True, states={'draft':[('readonly',False)]}),
+        'name' : fields.char('Subject', size=1024, readonly=True, states={'draft':[('readonly',False)]}),
+        'body' : fields.text('Email Text', readonly=True, states={'draft':[('readonly',False)]}),
+        'serialized_message':fields.text('Message', readonly=True, states={'draft':[('readonly',False)]}),
+        'state':fields.selection([
+            ('draft','Queued'),
+            ('sending','Waiting'),
+            ('send','Sent'),
+            ('error','Error'),
+        ],'Message Status', select=True, readonly=True),
+        'type':fields.selection([
+            ('default','Default Message'),
+            ('system','System Message'),
+        ],'Message Type', select=True, readonly=True),
+        'error':fields.text('Last Error', size=256, readonly=True, states={'draft':[('readonly',False)]}),
+        'date_create': fields.datetime('Date', readonly=True),
+        'priority':fields.integer('Message Priority', readonly=True),
+    }
+    _defaults = {
+        'date_create': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'state': lambda *a: 'draft',
+        'priority': lambda *a: '10',
+        'type': lambda *a: 'default',
+    }
+message_queue()
+
+class report_smtp_server(osv.osv):
+    _name = "report.smtp.server"
+    _description = "Server Statistics"
+    _auto = False
+    _columns = {
+        'server_id':fields.many2one('email.smtpclient','Server ID',readonly=True),
+        'name': fields.char('Server',size=64,readonly=True),
+        'history':fields.char('History',size=64, readonly=True),
+        'no':fields.integer('Total No.',readonly=True),
+    }
+    def init(self, cr):
+         cr.execute("""
+            create or replace view report_smtp_server as (
+                   select min(h.id) as id, c.id as server_id, h.name as history, h.name as name, count(h.name) as no  from email_smtpclient c inner join email_smtpclient_history h on c.id=h.server_id group by h.name, c.id
+                              )
+         """)
+         
+report_smtp_server()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/smtpclient/smtpclient_data.xml b/addons/smtpclient/smtpclient_data.xml
new file mode 100644
index 00000000000..1d4b4b0eda5
--- /dev/null
+++ b/addons/smtpclient/smtpclient_data.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data noupdate="1">
+		<record id="ir_cron_email_scheduler" model="ir.cron">
+            <field name="name">Send Email</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'email.smtpclient'" name="model"/>
+            <field eval="'_check_queue'" name="function"/>
+            <field eval="'()'" name="args"/>
+        </record>
+        
+        <record id="ir_cron_history_checker" model="ir.cron">
+            <field name="name">Queue Cleaner</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'email.smtpclient'" name="model"/>
+            <field eval="'_check_history'" name="function"/>
+            <field eval="'()'" name="args"/>
+        </record>
+	</data>
+</openerp>
diff --git a/addons/smtpclient/smtpclient_demo.xml b/addons/smtpclient/smtpclient_demo.xml
new file mode 100644
index 00000000000..9587ad8c306
--- /dev/null
+++ b/addons/smtpclient/smtpclient_demo.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data noupdate="1">
+		<record id="email_smtpclient_sendmailserver0" model="email.smtpclient">
+			<field eval="0" name="auth_type"/>
+			<field eval="&quot;&quot;&quot;SendMail Server&quot;&quot;&quot;" name="name"/>
+			<field eval="0" name="ssl"/>
+			<field eval="&quot;&quot;&quot;localhost&quot;&quot;&quot;" name="server"/>
+			<field eval="0" name="auth"/>
+			<field eval="&quot;&quot;&quot;Administrator &lt;admin@company.com&gt;&quot;&quot;&quot;" name="from_email"/>
+			<field eval="&quot;&quot;&quot;admin@company.com&quot;&quot;&quot;" name="email"/>
+			<field eval="&quot;&quot;&quot;new&quot;&quot;&quot;" name="state"/>
+			<field eval="&quot;&quot;&quot;admin&quot;&quot;&quot;" name="user"/>
+			<field eval="1" name="active"/>
+			<field eval="&quot;&quot;&quot;Verification Message. This is the code\n__code__ \nyou must copy in the OpenERP Email Server (Verify Server wizard).\nCreated by user __user__&quot;&quot;&quot;" name="verify_email"></field>
+			<field eval="&quot;&quot;&quot;default&quot;&quot;&quot;" name="type"/>
+			<field eval="25" name="port"/>
+			<field eval="[(6,0,[ref('base.user_root')])]" name="users_id"/>
+		</record>
+	</data>
+</openerp>
diff --git a/addons/smtpclient/smtpclient_view.xml b/addons/smtpclient/smtpclient_view.xml
new file mode 100644
index 00000000000..1704afc23dc
--- /dev/null
+++ b/addons/smtpclient/smtpclient_view.xml
@@ -0,0 +1,261 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_server_statistics_graph">
+            <field name="name">report.smtp.server.graph</field>
+            <field name="model">report.smtp.server</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Server Statistics" type="bar">
+                    <field name="no" operator="+" />
+                    <field name="history" operator="+" group="True" />
+                </graph>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_server_statistics_tree">
+            <field name="name">report.smtp.server.tree</field>
+            <field name="model">report.smtp.server</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Server Statistics">
+                    <field name="no" />
+                    <field name="history" />
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_server_statistics_form">
+            <field name="name">report.smtp.server.form</field>
+            <field name="model">report.smtp.server</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Server Statistics">
+                    <field name="no" />
+                    <field name="history" select="1" />
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window"
+            id="action_view_server_statistics_graph">
+            <field name="res_model">report.smtp.server</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_server_statistics_graph" />
+        </record>
+
+        <record model="ir.ui.view" id="email_smtpclient_form_new">
+            <field name="name">email.smtpclient.form</field>
+            <field name="model">email.smtpclient</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="SMTP Server">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" />
+                        <field name="date_create" select="1"/>
+                        <field name="priority"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Configuration">
+                            <group col="2" colspan="2">
+                                <separator string="Server Configuration" colspan="2" />
+                                <field name="auth_type" on_change="change_servertype(auth_type)"/>
+                                <field name="server" select="2" />
+                                <field name="port" select="2" />
+                                <field name="ssl" select="2" />
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="User Configuration" colspan="2" />
+                                <field name="email" select="1" on_change="change_email(email)"/>
+                                <field name="from_email" select="1"/>
+                                <field name="auth" select="2"/>
+                                <field name="user" select="1" attrs="{'required': [('auth_type','in',['gmail','yahoo'])]}"/>
+                                <field name="password" password="True" attrs="{'required': [('auth_type','in',['gmail','yahoo'])]}"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Message Queue Configuration" colspan="2" />
+                                <field name="active" select="2" />
+                                <field name="delete_queue" select="2" />
+                                <field name="delete_queue_period" select="2" attrs="{'readonly':[('delete_queue','not in',['content','all'])]}"/>
+                            </group>
+                            <newline/>
+                            <separator string="Server Information" colspan="4"/>
+                            <group col="3" colspan="4">
+                                <field name="state" select="1"/>
+                                <button name="set_to_draft" string="Set to Draft" type="object" states="waiting,confirm"/>
+                            </group>
+                            <group col="4" colspan="4">
+                                <field name="process_id"/>
+                                <button name="start_process" string="Start Server" attrs="{'invisible':[('pstate','=','running')]}" type="object"/>
+                                <button name="stop_process" string="Stop Server" attrs="{'invisible':[('pstate','=','stop')]}" type="object"/>
+                            </group>
+                        </page>
+                        <page string="Message Headers">
+                            <field name="header_ids" colspan="4" nolabel="1">
+                                <form string="Message Headers">
+                                    <field name="key"/>
+                                    <field name="value"/>
+                                </form>
+                                <tree string="Message Headers">
+                                    <field name="key"/>
+                                    <field name="value"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Messages">
+                            <separator string="Verification Message" colspan="4" />
+                            <field name="verify_email" colspan="4" nolabel="1" />
+                            <label string="__code__ for Verification Code" />
+                            <separator string="Test Message" colspan="4" />
+                            <field name="test_email" select="2" colspan="4" nolabel="1" />
+                        </page>
+                        <page string="Disclaimers">
+                            <separator string="Disclaimers Message" colspan="4" />
+                            <field name="disclaimers" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Permission">
+                            <separator string="Access Permission"
+                                colspan="4" />
+                            <field name="users_id" select="1"
+                                colspan="4" nolabel="1" />
+                        </page>
+
+                        <!--page string="Statistics">
+                            <field name="server_statistics"
+                                mode="graph,tree" colspan="4" nolabel="1" />
+                        </page-->
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="email_smtpclient_tree">
+            <field name="name">email.smtpclient.form</field>
+            <field name="model">email.smtpclient</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="SMTP Server">
+                    <field name="name" />
+                    <field name="pstate"/>
+                    <field name="from_email" />
+                    <field name="user" />
+                    <field name="server" />
+                    <field name="port" />
+                    <field name="type" />
+                    <field name="ssl" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window"
+            id="action_email_smtpclient_tree">
+            <field name="name">Email Server</field>
+            <field name="res_model">email.smtpclient</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="email_smtpclient_tree" />
+        </record>
+        
+        <menuitem name="Email Services" id="menu_smtpclient_administration_server" parent="base.menu_config"/>
+        
+        <menuitem name="SMTP Servers" id="menu_smtpclient_administration_smtp_server" parent="menu_smtpclient_administration_server" action="action_email_smtpclient_tree"/>
+                
+        <record model="ir.ui.view" id="email_smtpclient_history_tree">
+            <field name="name">email.smtpclient.history.tree</field>
+            <field name="model">email.smtpclient.history</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Server History">
+                    <field name="server_id" />
+                    <field name="user_id" />
+                    <field name="date_create" />
+                    <field name="name" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="email_smtpclient_history_form">
+            <field name="name">email.smtpclient.history.form</field>
+            <field name="model">email.smtpclient.history</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Server History">
+                    <field name="server_id"
+                        domain="[('id','=',parent.id)]" select="1"/>
+                    <field name="date_create" select="1"/>
+                    <field name="name" colspan="4" select="1"/>
+                </form>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window"
+            id="action_email_smtpclient_history_tree">
+            <field name="name">Sent Email History</field>
+            <field name="res_model">email.smtpclient.history</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="email_smtpclient_history_tree" />
+        </record>
+        
+        <menuitem name="Sent Email History" id="menu_smtpclient_administration_server_history" parent="menu_smtpclient_administration_smtp_server" action="action_email_smtpclient_history_tree"/>
+    
+        <act_window context="{'server_id': active_id}" domain="[('server_id', '=', active_id)]" id="act_mail_server_2_mail_history" name="Email History" res_model="email.smtpclient.history" src_model="email.smtpclient"/>
+        
+        
+        <!-- MessageQueue Views -->
+        <record model="ir.ui.view" id="email_smtpclient_queue_tree">
+            <field name="name">email.smtpclient.queue.tree</field>
+            <field name="model">email.smtpclient.queue</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Message Queue">
+                    <field name="date_create" />
+                    <field name="priority"/>
+                    <field name="to" />
+                    <field name="name" />
+                    <field name="server_id" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="email_smtpclient_queue_form">
+            <field name="name">email.smtpclient.queue.form</field>
+            <field name="model">email.smtpclient.queue</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Message Queue">
+                    <notebook>
+                        <page string="General">
+                            <field name="server_id"    select="1"/>
+                            <field name="to" select="1"/>
+                            <field name="priority"/>
+                            <field name="name" colspan="4" select="1"/>
+                            <separator string="Message" colspan="4" />
+                            <field name="body" colspan="4" select="1" nolabel="1"/>
+                            <field name="state" select="1"/>
+                            <field name="date_create" select="1"/>
+                        </page>
+                        <page string="Error">
+                            <separator string="Last Error occured" colspan="4"/>
+                            <field name="error" nolabel="1"/>
+                        </page>
+                        <page string="Message">
+                            <separator string="Message with All Headers" colspan="4"/>
+                            <field name="serialized_message" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="action_email_smtpclient_queue_tree">
+            <field name="name">Message Queue</field>
+            <field name="res_model">email.smtpclient.queue</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="email_smtpclient_queue_tree" />
+        </record>
+        <menuitem name="Message Queue" id="menu_smtpclient_administration_smtp_server_queue" parent="menu_smtpclient_administration_smtp_server" action="action_email_smtpclient_queue_tree"/>
+        
+        <act_window context="{'server_id': active_id}" domain="[('server_id', '=', active_id), ('state','!=', 'send')]" id="act_mail_server_2_mail_queue" name="Message Queus" res_model="email.smtpclient.queue" src_model="email.smtpclient"/>
+    </data>
+</openerp>
diff --git a/addons/smtpclient/smtpclient_wizard.xml b/addons/smtpclient/smtpclient_wizard.xml
new file mode 100644
index 00000000000..297fd4ae3ec
--- /dev/null
+++ b/addons/smtpclient/smtpclient_wizard.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+			<wizard
+				string="Send Verification Code"
+				model="email.smtpclient"
+				name="email.sendcode"
+				id="wizard_email_sendcode"/>
+				
+			<wizard
+				string="Verify Server"
+				model="email.smtpclient"
+				name="email.verifycode"
+				id="wizard_email_verifycode"/>
+			
+			<wizard
+				string="Send Test Email"
+				model="email.smtpclient"
+				name="email.testemail"
+				id="wizard_email_testemail"/>
+			
+			<wizard id="base.res_partner_mass_mailing_wizard" 
+				model="res.partner" 
+				name="res.partner.spam_send.smtpclient"
+				string="Mass Mailing"/>
+        
+	</data>
+</openerp>
diff --git a/addons/purchase_manual/wizard/__init__.py b/addons/smtpclient/wizard/__init__.py
similarity index 82%
rename from addons/purchase_manual/wizard/__init__.py
rename to addons/smtpclient/wizard/__init__.py
index 9f53e1a75ad..313d0f737a2 100644
--- a/addons/purchase_manual/wizard/__init__.py
+++ b/addons/smtpclient/wizard/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,5 +18,9 @@
 #
 ##############################################################################
 
+import sendcode
+import verifycode
+import testemail
+import wizard_spam
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
-import purchase_line_invoice
diff --git a/addons/smtpclient/wizard/sendcode.py b/addons/smtpclient/wizard/sendcode.py
new file mode 100644
index 00000000000..632b00265bf
--- /dev/null
+++ b/addons/smtpclient/wizard/sendcode.py
@@ -0,0 +1,67 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+from osv import osv
+import time
+import sys
+from tools.translate import _
+
+form = '''<?xml version="1.0"?>
+<form string="Send Code">
+    <field name="emailto" colspan="4"/>
+</form>'''
+
+fields = {
+    'emailto': {'string': 'Email Address', 'required':True, 'size': 255 , 'type': 'char', 'help': 'Enter the address Email where you want to get the Verification Code'}
+}
+
+class sendcode(wizard.interface):
+
+    def check_code(self, cr, uid, data, context):
+        code = pooler.get_pool(cr.dbname).get('email.smtpclient').browse(cr, uid, [data['id']])[0].code
+        if code:
+            raise osv.except_osv(_('Error'), _('Verification Code Already Generated !'))
+        return {}
+
+
+    def send_code(self, cr, uid, data, context):
+        state = pooler.get_pool(cr.dbname).get('email.smtpclient').test_verify_email(cr, uid, [data['id']], data['form']['emailto'])
+        if not state:
+            raise osv.except_osv(_('Error'), _('Verification Failed. Please check the Server Configuration!'))
+
+        return {}
+
+    states = {
+        'init': {
+            'actions': [check_code],
+            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel'),('send','Send Code')]}
+        },
+        'send': {
+            'actions': [send_code],
+            'result': {'type':'state', 'state':'end'}
+        }
+    }
+sendcode('email.sendcode')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/wizard_state_open.py b/addons/smtpclient/wizard/testemail.py
similarity index 58%
rename from addons/account/wizard/wizard_state_open.py
rename to addons/smtpclient/wizard/testemail.py
index 9720f48e25e..5cd03db74ca 100644
--- a/addons/account/wizard/wizard_state_open.py
+++ b/addons/smtpclient/wizard/testemail.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,38 +20,38 @@
 
 import wizard
 import pooler
-import netsvc
+from osv import osv
 from tools.translate import _
 
 form = '''<?xml version="1.0"?>
-<form string="Open Invoice">
-    <label string="Are you sure you want to open this invoice ?"/>
-    <newline/>
-    <label string="(Invoice should be unreconciled if you want to open it)"/>
+<form string="Test Email">
+    <field name="emailto" colspan="4"/>
 </form>'''
 
 fields = {
+    'emailto': {'string': 'Email Address', 'required':True, 'size': 255 , 'type': 'char', 'help': 'Enter the address Email where you want to get the Test Email'}
 }
 
-def _change_inv_state(self, cr, uid, data, context):
-    pool_obj = pooler.get_pool(cr.dbname)
-    data_inv = pool_obj.get('account.invoice').browse(cr, uid, data['ids'][0])
-    if data_inv.reconciled:
-        raise wizard.except_wizard(_('Warning'), _('Invoice is already reconciled'))
-    wf_service = netsvc.LocalService("workflow")
-    res = wf_service.trg_validate(uid, 'account.invoice', data['ids'][0], 'open_test', cr)
-    return {}
+class testemail(wizard.interface):
+
+    def send_code(self, cr, uid, data, context):
+        state = pooler.get_pool(cr.dbname).get('email.smtpclient').test_verify_email(cr, uid, [data['id']], data['form']['emailto'], test=True)
+        if not state:
+            raise osv.except_osv(_('Error'), _('Verification Failed. Please check the Server Configuration!'))
+        return {}
 
-class wiz_state_open(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','No','gtk-no'),('yes','Yes','gtk-yes')]}
+            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel'),('send','Send Email')]}
         },
-        'yes': {
-            'actions': [_change_inv_state],
+        'send': {
+            'actions': [send_code],
             'result': {'type':'state', 'state':'end'}
         }
     }
-wiz_state_open('account.wizard_paid_open')
+testemail('email.testemail')
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/smtpclient/wizard/verifycode.py b/addons/smtpclient/wizard/verifycode.py
new file mode 100644
index 00000000000..096523c6b69
--- /dev/null
+++ b/addons/smtpclient/wizard/verifycode.py
@@ -0,0 +1,71 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import pooler
+from osv import osv
+from tools.translate import _
+
+form = '''<?xml version="1.0"?>
+<form string="Verify Code">
+    <field name="code" colspan="4"/>
+</form>'''
+
+fields = {
+    'code': {'string': 'Verification Code','required':True,  'size': 255 , 'type': 'char', 'help': 'Enter the verification code thay you get in your verification Email'}
+}
+class verifycode(wizard.interface):
+
+    def checkcode(self, cr, uid, data, context):
+
+        server_pool = pooler.get_pool(cr.dbname).get('email.smtpclient')
+        cron_pool = pooler.get_pool(cr.dbname).get('ir.cron')
+        
+        server = server_pool.browse(cr, uid, data['id'], context)
+        state = server.state
+        
+        if state == 'confirm':
+            raise osv.except_osv(_('Error'), _('Server already verified!'))
+
+        code = server.code
+        if code == data['form']['code']:
+            if server_pool.create_process(cr, uid, [data['id']], context={}):
+                server_pool.write(cr, uid, [data['id']], {'state':'confirm', 'pstate':'running'})
+                print 'process created'
+        else:
+            raise osv.except_osv(_('Error'), _('Verification failed. Invalid Verification Code!'))
+        
+        return {}
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel'),('check','Verify Code')]}
+        },
+        'check': {
+            'actions': [checkcode],
+            'result': {'type':'state', 'state':'end'}
+        }
+    }
+verifycode('email.verifycode')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/smtpclient/wizard/wizard_spam.py b/addons/smtpclient/wizard/wizard_spam.py
new file mode 100644
index 00000000000..3b289988ef3
--- /dev/null
+++ b/addons/smtpclient/wizard/wizard_spam.py
@@ -0,0 +1,92 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import wizard
+import pooler
+import tools
+import re
+
+email_send_form = '''<?xml version="1.0"?>
+<form string="Mass Mailing">
+    <field name="smtp_server" colspan="4"/>
+    <newline/>
+    <field name="subject" colspan="4"/>
+    <newline/>
+    <field name="text" colspan="4"/>
+</form>'''
+
+email_send_fields = {
+    'smtp_server': {'string':"SMTP Server", 'type':'many2one', 'relation':'email.smtpclient', 'required':True},
+    'subject': {'string':'Subject', 'type':'char', 'size':64, 'required':True},
+    'text': {'string':'Message', 'type':'text_tag', 'required':True}
+}
+
+def merge_message(self, cr, uid, message, object, partner):
+    
+    def merge(match):
+        exp = str(match.group()[2:-2]).strip()
+        result = eval(exp, {'object':object, 'partner':partner})
+        if result in (None, False):
+            return str("--------")
+        return str(result)
+    
+    com = re.compile('(\[\[.+?\]\])')
+    msg = com.sub(merge, message)
+    
+    return msg
+
+# this sends an email to ALL the addresses of the selected partners.
+def _mass_mail_send(self, cr, uid, data, context):
+    nbr = 0
+    partners = pooler.get_pool(cr.dbname).get('res.partner').browse(cr, uid, data['ids'], context)
+    email_server = pooler.get_pool(cr.dbname).get('email.smtpclient')
+    
+    for partner in partners:
+        for adr in partner.address:
+            if adr.email:
+                name = adr.name or partner.name
+                to = adr.email
+                
+                subject = merge_message(self, cr, uid, data['form']['subject'], adr, partner)
+                message = merge_message(self, cr, uid, data['form']['text'], adr, partner)
+                
+                email_server.send_email(cr, uid, data['form']['smtp_server'], to, subject, message)
+                nbr += 1
+        pooler.get_pool(cr.dbname).get('res.partner.event').create(cr, uid,
+                {'name': 'Email sent through mass mailing',
+                 'partner_id': partner.id,
+                 'description': data['form']['text'], })
+#TODO: log number of message sent
+    return {'email_sent': nbr}
+
+class part_email(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch': email_send_form, 'fields': email_send_fields, 'state':[('end','Cancel'), ('send','Send Email')]}
+        },
+        'send': {
+            'actions': [_mass_mail_send],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+part_email('res.partner.spam_send.smtpclient')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/__terp__.py b/addons/stock/__openerp__.py
similarity index 100%
rename from addons/stock/__terp__.py
rename to addons/stock/__openerp__.py
diff --git a/addons/stock/i18n/ar.po b/addons/stock/i18n/ar.po
index c32aae58624..3e5b9f4228a 100644
--- a/addons/stock/i18n/ar.po
+++ b/addons/stock/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po
index 853beecd170..58500b52f02 100644
--- a/addons/stock/i18n/bg.po
+++ b/addons/stock/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index 530754279e0..9028b361d29 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index e20316adf60..a48c0569f95 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po
index 70ff0fc66e2..f3468d9ccad 100644
--- a/addons/stock/i18n/cs.po
+++ b/addons/stock/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+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 2140d01d74b..6c3021ef3d8 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-28 14:28+0000\n"
+"PO-Revision-Date: 2010-04-15 13:35+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -370,7 +370,7 @@ msgstr "Beschaffungslager"
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 msgid "Production Lots"
-msgstr "Fertigungslos"
+msgstr "Fertigungslose"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -688,7 +688,6 @@ msgstr "Lagerort beim Partner"
 msgid ""
 "Tracking lot is the code that will be put on the logistical unit/pallet"
 msgstr ""
-"Losnummer ist der Code, der die logistische Einheit / Palette identifiziert"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -1888,7 +1887,7 @@ msgstr "STOCK_MEDIA_PAUSE"
 #. module: stock
 #: view:product.product:0
 msgid "Lots"
-msgstr "Lose"
+msgstr "Fertigungslose"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -1898,7 +1897,7 @@ msgstr "Alles zusammenpacken"
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outging Lots"
-msgstr "Verfolge Warenversand"
+msgstr "Verfolge Warenversand (Lose)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -2113,7 +2112,7 @@ msgstr "Projekt Administrator"
 #: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
 #: view:stock.report.prodlots:0
 msgid "Stock by Lots"
-msgstr "Bestand Fertigungslos"
+msgstr "Bestand je Fertigungslos"
 
 #. module: stock
 #: field:stock.move,auto_validate:0
@@ -2226,7 +2225,7 @@ msgstr "STOCK_REVERT_TO_SAVED"
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Production Lots"
-msgstr "Fertigungsserie"
+msgstr "Verfolge Produktion (Lose)"
 
 #. module: stock
 #: view:stock.picking:0
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index d352ae5e37b..7e11a40e978 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index bf1080ef69c..2fcb9a24dfd 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po
index b4b1359fbb0..b70cd25f7f5 100644
--- a/addons/stock/i18n/es_AR.po
+++ b/addons/stock/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po
index 056a948e921..ee2a8ae9819 100644
--- a/addons/stock/i18n/et.po
+++ b/addons/stock/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po
index a078048d952..6981c1a7dcb 100644
--- a/addons/stock/i18n/fi.po
+++ b/addons/stock/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index 07036f64c31..9d0c7b40248 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index 9a2b6c6fc0b..937cf4bc72a 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po
index ee6c0a08046..41304fbb2d0 100644
--- a/addons/stock/i18n/hu.po
+++ b/addons/stock/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index d83696e1270..2ae4c4dfc1a 100644
--- a/addons/stock/i18n/id.po
+++ b/addons/stock/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+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 bb1a268d130..ac11dbb3098 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2010-01-09 17:19+0000\n"
-"Last-Translator: Davide Corio <davide.corio@domsense.com>\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-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po
index f953c35596d..783312d8173 100644
--- a/addons/stock/i18n/ko.po
+++ b/addons/stock/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index 6d4f0ddc311..02307919ac9 100644
--- a/addons/stock/i18n/lt.po
+++ b/addons/stock/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 0aa3bd7f523..b3085199524 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po
index ff5a77b3a3b..3b843fc2aca 100644
--- a/addons/stock/i18n/nl_BE.po
+++ b/addons/stock/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+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 4f20753cf2e..942cb5d0730 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index b7545341407..3933b815043 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+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 a1923cf2128..e3244504e7d 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po
index 30fb980da93..63dc08d4fef 100644
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 6d3d70f20fc..e188ad752d3 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 11:06+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-19 05:33+0000\n"
+"Last-Translator: grisha <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-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -44,7 +44,7 @@ msgstr ""
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -70,7 +70,7 @@ msgstr ""
 #. module: stock
 #: rml:lot.location:0
 msgid "Total :"
-msgstr ""
+msgstr "Итого:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -81,7 +81,7 @@ msgstr ""
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "UoM"
-msgstr ""
+msgstr "Ед. изм."
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.return_picking
@@ -114,7 +114,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr ""
+msgstr "Получено изделий"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
@@ -141,7 +141,7 @@ msgstr "Партнер"
 #. module: stock
 #: help:product.product,track_incoming:0
 msgid "Force to use a Production Lot during receptions"
-msgstr ""
+msgstr "Принудительно назначать серийный номер партии при приёмке"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -154,7 +154,7 @@ msgstr "Журнал перемещений"
 #: field:stock.production.lot.revision,lot_id:0
 #: field:stock.report.prodlots,prodlot_id:0
 msgid "Production lot"
-msgstr ""
+msgstr "Партия изделий"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -196,17 +196,17 @@ msgstr "Ед. изм."
 #: selection:stock.picking,state:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
-msgstr ""
+msgstr "Доступно"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Make Parcel"
-msgstr ""
+msgstr "Сформировать упаковку"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "Packing result"
-msgstr ""
+msgstr "Сформировать упаковку"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -256,7 +256,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Sent"
-msgstr ""
+msgstr "Отправлено изделий"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -284,7 +284,7 @@ msgstr ""
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr ""
+msgstr "Общий итог"
 
 #. module: stock
 #: view:stock.location:0
@@ -327,12 +327,12 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Move Information"
-msgstr ""
+msgstr "Сведения о перемещении товаров"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Unreceived Products"
-msgstr ""
+msgstr "Неполученные изделия"
 
 #. module: stock
 #: field:stock.inventory,state:0
@@ -370,7 +370,7 @@ msgstr "Местоположение снабжения"
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 msgid "Production Lots"
-msgstr ""
+msgstr "Партии изделий"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -424,7 +424,7 @@ msgstr "Адрес местоположения"
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
-msgstr ""
+msgstr "Партии изделий используются для присвоения серийных номеров"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_13
@@ -485,12 +485,12 @@ msgstr ""
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr ""
+msgstr "Расположение склада"
 
 #. module: stock
 #: help:product.product,track_production:0
 msgid "Force to use a Production Lot during production order"
-msgstr ""
+msgstr "Принудительно назначать серийны номера для партий изделий"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -639,7 +639,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr ""
+msgstr "Ручное управление"
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -680,7 +680,7 @@ msgstr "Метоположения партнера"
 #: help:stock.move,tracking_id:0
 msgid ""
 "Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr ""
+msgstr "Логистическая единица - это код, присваиваемый упаковке."
 
 #. module: stock
 #: view:stock.tracking:0
@@ -700,7 +700,7 @@ msgstr ""
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Packing List:"
-msgstr ""
+msgstr "Упаковочный перечень"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -715,12 +715,12 @@ msgstr ""
 #. module: stock
 #: wizard_field:stock.location.products,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "От"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "weight"
-msgstr ""
+msgstr "Вес"
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -735,7 +735,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Production lot revisions"
-msgstr ""
+msgstr "Ревизии партий изделий"
 
 #. module: stock
 #: view:stock.picking:0
@@ -918,12 +918,12 @@ msgstr "Отправка товаров"
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Availability"
-msgstr ""
+msgstr "Отменить доступность"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
-msgstr ""
+msgstr "Созданные перемещения товаров"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -950,7 +950,7 @@ msgstr ""
 #: view:stock.move:0
 #: field:stock.move,date_planned:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: stock
 #: view:product.product:0
@@ -1042,7 +1042,7 @@ msgstr "Отменить"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Split in production lots"
-msgstr ""
+msgstr "Разделить партию по отдельным серийным номерам"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory
@@ -1070,7 +1070,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_tracking
 msgid "Stock Tracking Lots"
-msgstr ""
+msgstr "Отслеживание партий"
 
 #. module: stock
 #: rml:lot.stock.overview:0
@@ -1110,7 +1110,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_move_form4
 #: model:ir.ui.menu,name:stock.menu_action_move_form4
 msgid "Available Moves"
-msgstr ""
+msgstr "Доступные перемещения товаров"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1269,7 +1269,7 @@ msgstr ""
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Value"
-msgstr ""
+msgstr "Значение"
 
 #. module: stock
 #: field:stock.picking,type:0
@@ -1289,7 +1289,7 @@ msgstr "Метод доставки"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
 msgid "Partial packing"
-msgstr ""
+msgstr "Упаковка по частям"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1422,7 +1422,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Изделия к отправке"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1452,7 +1452,7 @@ msgstr ""
 #. module: stock
 #: field:stock.production.lot,date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: stock
 #: selection:stock.location,usage:0
@@ -1467,7 +1467,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr ""
+msgstr "Сделать доступным принудительно"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
@@ -1504,7 +1504,7 @@ msgstr "Учет движения партий"
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
@@ -1524,7 +1524,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
-msgstr ""
+msgstr "Доступные запасы"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_fill_inventory
@@ -1546,7 +1546,7 @@ msgstr ""
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Lot"
-msgstr ""
+msgstr "Партия"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
@@ -1556,7 +1556,7 @@ msgstr ""
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
-msgstr ""
+msgstr "Количество(единицы продажи)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
@@ -1620,7 +1620,7 @@ msgstr "Инкотермс"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Total:"
-msgstr ""
+msgstr "Итого:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1650,7 +1650,7 @@ msgstr ""
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr ""
+msgstr "Наименование ревизии"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1723,7 +1723,7 @@ msgstr "Склады"
 #. module: stock
 #: help:product.product,track_outgoing:0
 msgid "Force to use a Production Lot during deliveries"
-msgstr ""
+msgstr "Принудительно назначать серийный номер партии при перевозке"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1862,7 +1862,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Lots"
-msgstr ""
+msgstr "Партии"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -1872,7 +1872,7 @@ msgstr "Все сразу"
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outging Lots"
-msgstr ""
+msgstr "Отслеживать исходящие партии"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -1910,7 +1910,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Значок"
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -1934,12 +1934,12 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
-msgstr ""
+msgstr "Неевропейские заказчики"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Components"
-msgstr ""
+msgstr "Компоненты"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
@@ -2008,7 +2008,7 @@ msgstr "Подтвердить"
 #. module: stock
 #: view:stock.picking:0
 msgid "Check Availability"
-msgstr ""
+msgstr "Проверять доступность"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
@@ -2078,7 +2078,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
 #: view:stock.report.prodlots:0
 msgid "Stock by Lots"
-msgstr ""
+msgstr "Склады с партиями этого товара"
 
 #. module: stock
 #: field:stock.move,auto_validate:0
@@ -2100,7 +2100,7 @@ msgstr ""
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2163,7 +2163,7 @@ msgstr "Полки (Y)"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
 msgid "Set Stock to 0"
-msgstr ""
+msgstr "Установить запасы в 0"
 
 #. module: stock
 #: view:stock.location:0
@@ -2188,7 +2188,7 @@ msgstr ""
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Production Lots"
-msgstr ""
+msgstr "Отслеживать партии изделий"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2218,7 +2218,7 @@ msgstr ""
 #: field:stock.move,prodlot_id:0
 #: view:stock.production.lot:0
 msgid "Production Lot"
-msgstr ""
+msgstr "Партия изделий"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_traceability
@@ -2229,7 +2229,7 @@ msgstr "Возможность учета движения"
 #. module: stock
 #: field:stock.picking,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Дата заказа"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
@@ -2267,12 +2267,12 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Print Item Labels"
-msgstr ""
+msgstr "Печать этикеток товаров"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Moves"
-msgstr ""
+msgstr "Перемещения тоаров"
 
 #. module: stock
 #: field:stock.move,location_dest_id:0
@@ -2380,7 +2380,7 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Move State"
-msgstr ""
+msgstr "Состояни перемещния товаров"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index de0b55a3b71..7667cc7fc71 100644
--- a/addons/stock/i18n/sl.po
+++ b/addons/stock/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po
index 4706da4d2df..ffcd8090f24 100644
--- a/addons/stock/i18n/sr.po
+++ b/addons/stock/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po
index 6cc9edaf29d..56168254a4e 100644
--- a/addons/stock/i18n/sv.po
+++ b/addons/stock/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po
index 75aec9ca36c..049b3f7ffc7 100644
--- a/addons/stock/i18n/th.po
+++ b/addons/stock/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po
index 926f5db4071..98b132e1af4 100644
--- a/addons/stock/i18n/tlh.po
+++ b/addons/stock/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+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 53ea44f15b7..725c39fe92c 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po
index 69b8104ee67..c59f1588e10 100644
--- a/addons/stock/i18n/uk.po
+++ b/addons/stock/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 070834195e5..7829e5d4876 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 29330d00afb..1128e1ce113 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index d3f04ae9afc..487dbcf55ea 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -12,7 +12,7 @@
       <field name="inherit_id" ref="base.view_partner_form"/>
       <field name="arch" type="xml">
         <page string="Sales &amp; Purchases" position="inside">
-          <group colspan="4" col="4">
+          <group colspan="4" col="4" groups="base.group_extended">
             <separator string="Stock Properties" colspan="4"/>
             <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" />
             <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]"/>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index ce933686760..ad189ee546a 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -335,7 +335,7 @@ class product_template(osv.osv):
             'stock.location',
             type='many2one',
             relation='stock.location',
-            string="Requisition Location",
+            string="Procurement Location",
             method=True,
             view_load=True,
             domain=[('usage','like','procurement')],
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index d027465c34d..46f4ca6e8e2 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -2,19 +2,19 @@
 <openerp>
     <data>
 
-	    <record id="product_search_form_view_stock" model="ir.ui.view">
+        <record id="product_search_form_view_stock" model="ir.ui.view">
             <field name="name">product.search.stock.form</field>
             <field name="model">product.product</field>
             <field name="type">search</field>
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
-               	<field name="pricelist_id" select="1" widget="selection" position="before">
-               		<field name="location_id" select="1" widget="selection" context="{'location': self}" />
-               		<separator orientation="vertical"/>
-               	</field>
+                   <field name="pricelist_id" select="1" widget="selection" position="before">
+                       <field name="location_id" select="1" widget="selection" context="{'location': self}" />
+                       <separator orientation="vertical"/>
+                   </field>
             </field>
         </record>
-        
+
         <record id="view_category_property_form" model="ir.ui.view">
             <field name="name">product.category.stock.property.form.inherit</field>
             <field name="model">product.category</field>
@@ -54,20 +54,21 @@
             </field>
         </record>
 
-		<record id="view_product_standard_price_form" model="ir.ui.view">
+        <record id="view_product_standard_price_form" model="ir.ui.view">
             <field name="name">product.product.standard.price.form.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-				<field name="standard_price" position="replace">
-					<group col="4" colspan="2">
-						<field name="standard_price" readonly="True"/>
-						<button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
-	           		</group>
-	           	</field>
-	        </field>
-	    </record>
+                <field name="standard_price" position="replace">
+                    <label string="Cost Price" align="1.0"/>
+                    <group col="2" colspan="1">
+                        <field name="standard_price" readonly="True" nolabel="1"/>
+                        <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
+                    </group>
+                </field>
+            </field>
+        </record>
 
         <record id="view_normal_property_acc_form" model="ir.ui.view">
             <field name="name">product.normal.stock.acc.property.form.inherit</field>
@@ -77,8 +78,8 @@
             <field name="priority">26</field>
             <field name="arch" type="xml">
                 <field name="property_account_expense" position="after">
-                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
                 </field>
             </field>
         </record>
@@ -112,7 +113,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="store" position="after">
-                    <group col="2" colspan="2" name="store">
+                    <group col="2" colspan="2" name="store" groups="base.group_extended">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
                         <field name="property_stock_procurement" widget="selection" domain="[('usage','=','procurement')]"/>
                         <field name="property_stock_production" widget="selection"/>
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 85a46601479..da1dd27ff14 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -142,6 +142,7 @@ class report_stock_lines_date(osv.osv):
     _name = "report.stock.lines.date"
     _description = "Dates of Inventories"
     _auto = False
+    _order = "date"
     _columns = {
         'id': fields.integer('Inventory Line Id', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True, select=True),
@@ -152,16 +153,13 @@ class report_stock_lines_date(osv.osv):
         cr.execute("""
             create or replace view report_stock_lines_date as (
                 select
-                min(l.id) as id,
+                p.id as id,
                 p.id as product_id,
                 max(s.date) as date
-                from
+            from
                 product_product p
-                left outer join
-                stock_inventory_line l on (p.id=l.product_id)
-                left join stock_inventory s
-                on (l.inventory_id=s.id)
-                where l.create_date is not null
+                    left outer join stock_inventory_line l on (p.id=l.product_id)
+                    left join stock_inventory s on (l.inventory_id=s.id)
                 and s.state = 'done'
                 group by p.id
             )""")
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 9c1acc1fb31..f8ce77cd7d0 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -57,8 +57,8 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" />
-                        <filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" />
+                        <filter string="This Year" name="this_year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" />
+                        <filter string="This Month" name="this_month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" />
                         <separator orientation="vertical"/>
   						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
   						<filter string="Order Date" icon="terp-stock" domain="[('order_date',=,time.strftime('%%Y-%%m-%%d'))]"  />
@@ -99,7 +99,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_report_stock_picking_tree"/>
-            <field name="context">{"search_default_This Year":1,"search_default_This Month":1}</field>
+            <field name="context">{"search_default_this_year":1,"search_default_this_month":1}</field>            
             <field name="search_view_id" ref="view_report_report_stock_picking_filter"/>
         </record>
 
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 6191cd75af4..1bf4e675dcd 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -9,13 +9,12 @@
             <field name="arch" type="xml">
                 <search string="Search Location">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
-                        <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
-                        <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
-
+                        <filter icon="terp-stock" name="in_location" string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
+                        <filter icon="terp-stock" string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
+                        <filter icon="terp-stock" string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
                         <separator orientation="vertical"/>
-                        <field name="location_id" select="1" />
-                        <field name="product_id" select="1" />
+                        <field name="location_id" select="1"/>
+                        <field name="product_id" select="1" default="1"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
@@ -35,7 +34,7 @@
                 <form string="Stock by Lots">
                     <field name="location_id"/>
                     <field name="product_id"/>
-                    <field name="prodlot_id"/>
+                    <field name="prodlot_id" groups="base.group_extended"/>
                     <field name="name"/>
                 </form>
             </field>
@@ -49,23 +48,34 @@
                 <tree string="Stock by Lots">
                     <field name="location_id"/>
                     <field name="product_id"/>
-                    <field name="prodlot_id"/>
+                    <field name="prodlot_id" groups="base.group_extended"/>
                     <field name="name"/>
                 </tree>
             </field>
         </record>
 
+        <record id="stock_report_prodlots_graph" model="ir.ui.view">
+            <field name="name">stock.report.prodlots.view</field>
+            <field name="model">stock.report.prodlots</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Stock by Lots" type="bar">
+                    <field name="product_id"/>
+                    <field name="name"/>
+                </graph>
+            </field>
+        </record>
+
+
         <record id="action_stock_report_prodlots_form" model="ir.actions.act_window">
             <field name="name">Inventory by Location</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.report.prodlots</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'full':'1',"search_default_Internal Locations":1}</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="context">{'full':'1',"search_default_in_location":1}</field>
             <field name="search_view_id" ref="view_stock_report_prodlots_filter" />
         </record>
-
-
         <record id="stock_report_tracklots_tree" model="ir.ui.view">
             <field name="name">stock.report.tracklots.view</field>
             <field name="model">stock.report.tracklots</field>
@@ -90,11 +100,6 @@
 <!--            name="Traceability"-->
 <!--            parent="next_id_61"/>-->
 
-        <menuitem
-            action="action_stock_report_prodlots_form"
-            id="menu_stock_report_prodlots"
-            parent="stock.menu_stock_inventory_control" sequence="10"/>
-
         <act_window
             context="{'product_id': active_id}"
             id="act_stock_product_location_open"
@@ -141,20 +146,42 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="report_stock_lines_date_search">
+            <field name="name">report.stock.lines.date.search</field>
+            <field name="model">report.stock.lines.date</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Dates of Inventories">
+                    <filter icon="gtk-media-rewind" string="Stockable"
+                        default="1"
+                        domain="[('product_id.type','=', 'product')]"/>
+                    <filter icon="gtk-media-rewind" string="Consumable"
+                        domain="[('product_id.type','=', 'consumable')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="gtk-media-rewind" string="Non Inv"
+                        domain="[('date','=', False)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id" select="1"/>
+                    <field name="date" select="1" />
+                </search>
+            </field>
+        </record>
+
+
         <record model="ir.ui.view" id="report_stock_lines_date_form">
             <field name="name">report.stock.lines.date.form</field>
             <field name="model">report.stock.lines.date</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Dates of Inventories">
-                    <field name="product_id" select="1"/>
-                    <field name="date" select="1" />
+                    <field name="product_id"/>
+                    <field name="date"/>
                 </form>
             </field>
         </record>
 
         <record model="ir.actions.act_window" id="action_stock_line_date">
-            <field name="name">Latest Inventories Dates by Product</field>
+            <field name="name">Dates of Latest Inventories by Product</field>
             <field name="res_model">report.stock.lines.date</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -162,6 +189,19 @@
 
         <menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date" sequence="2"/>
 
+        <record id="view_location_graph" model="ir.ui.view">
+            <field name="name">stock.location.graph</field>
+            <field name="model">stock.location</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Stock Location">
+                    <field name="complete_name"/>
+                    <field name="stock_real_value" operator="+"/>
+                    <field name="stock_virtual_value" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
         <record id="view_location_tree_3" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
@@ -180,12 +220,17 @@
             <field name="name">Inventory Valuation</field>
             <field name="res_model">stock.location</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_location_tree_3"/>
         </record>
         <menuitem action="action_location_tree_3" id="menu_action_location_tree_3" parent="next_id_61" sequence="1"/>
 
-    <!-- end...  -->
+        <menuitem
+            action="action_stock_report_prodlots_form"
+            id="menu_stock_report_prodlots"
+            parent="next_id_61" sequence="10"/>
+
+
 
     </data>
 </openerp>
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 2dae9d23d5c..de4eccdde55 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -35,7 +35,7 @@
             <field name="location_id" ref="stock_location_stock"/>
         </record>
         <record id="stock_location_14" model="stock.location">
-            <field name="name">Finished products</field>
+            <field name="name">Shelf 2</field>
             <field name="location_id" ref="stock_location_13"/>
             <field model="account.account" name="account_id" search="[('name','=','Merchandise Type B')]"/>
         </record>
@@ -48,7 +48,7 @@
             <field name="location_id" ref="stock_location_stock"/>
         </record>
         <record id="stock_location_components" model="stock.location">
-            <field name="name">Components</field>
+            <field name="name">Shelf 1</field>
             <field name="location_id" ref="stock_location_workshop"/>
         </record>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9247625ebd7..03fb721959b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -17,9 +17,9 @@
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
-                    <field name="prod_lot_id"/>
+                    <field name="prod_lot_id" groups="base.group_extended"/>
                     <button name="%(stock.action_view_stock_inventory_line_split)d"
-                            string="Split inventory lines"
+                            string="Split inventory lines" groups="base.group_extended"
                             type="action" icon="gtk-justify-fill"/>
                     <field name="location_id"/>
                 </tree>
@@ -34,10 +34,10 @@
                     <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
-                    <field name="prod_lot_id"/>
+                    <field name="prod_lot_id" groups="base.group_extended"/>
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
                         <button name="%(stock.action_view_stock_inventory_line_split)d"
-                            string="Split inventory lines"
+                            string="Split inventory lines" groups="base.group_extended"
                             type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
@@ -88,11 +88,11 @@
                                 <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
-                                <field name="prod_lot_id"/>
+                                <field name="prod_lot_id" groups="base.group_extended"/>
                                 <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
                                 <field name="state" invisible="1"/>
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
-                                    string="Split inventory lines"
+                                    string="Split inventory lines" groups="base.group_extended"
                                     type="action" icon="gtk-justify-fill" states="draft"/>
                             </tree>
                             <form string="Inventory Lines">
@@ -100,15 +100,15 @@
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <field  domain="[('usage','=','internal')]" name="location_id" select="1"/>
-                                <field name="prod_lot_id"/>
+                                <field name="prod_lot_id" groups="base.group_extended"/>
                                 <group colspan="2" col="3">
                                     <button name="%(stock.action_view_stock_inventory_line_split)d"
-                                        string="Split inventory lines"
+                                        string="Split inventory lines" groups="base.group_extended"
                                         type="action" icon="gtk-justify-fill"/>
                                 </group>
                             </form>
                         </field>
-                    </page><page string="Posted Inventory">
+                    </page><page string="Posted Inventory" groups="base.group_extended">
                         <field colspan="4" name="move_ids" nolabel="1"/>
                     </page>
                     </notebook>
@@ -176,7 +176,9 @@
             <field name="view_id" ref="view_tracking_tree"/>
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="4"/>
-        <menuitem action="action_tracking_form" id="menu_action_tracking_form" parent="menu_traceability"/>
+        <menuitem action="action_tracking_form" id="menu_action_tracking_form"
+            groups="base.group_extended"
+            parent="menu_traceability"/>
 
         <record id="lot_line_tree" model="ir.ui.view">
             <field name="name">stock.tracking.tree</field>
@@ -230,11 +232,11 @@
                     <notebook colspan="4">
                         <page string="Production Lot">
                             <field name="name" select="1"/>
-                            <field name="ref" select="2"/>
+                            <field name="ref"/>
                             <field name="prefix" select="1"/>
                             <field name="product_id" select="1"/>
                             <field name="stock_available"/>
-                            <field name="date" select="2"/>
+                            <field name="date"/>
                             <field colspan="4" name="revisions" nolabel="1"/>
                         </page>
                     </notebook>
@@ -264,7 +266,7 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
                         <field name="prefix" select="1"/>
                         <field name="name" select="1"/>
@@ -287,9 +289,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_production_lot_tree"/>
             <field name="search_view_id" ref="search_product_lot_filter" />
-            <field name="context">{'full':'1',"search_default_Available":1}</field>
+            <field name="context">{'full':'1',"search_default_available":1}</field>
         </record>
-        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability"/>
+        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="base.group_extended"/>
 
         #
         # Lot composition (history)
@@ -304,8 +306,8 @@
                     <field name="product_id" select="1"/>
                     <field name="product_qty" select="1"/>
                     <field name="product_uom" select="1" string="UOM"/>
-                    <field name="prodlot_id" select="1"/>
-                    <field name="product_packaging" domain="[('product_id','=',product_id)]"/>
+                    <field name="prodlot_id" select="1" groups="base.group_extended"/>
+                    <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
                     <field name="picking_id"/>
                     <field name="location_id" select="1"/>
                     <field name="location_dest_id" select="1"/>
@@ -326,8 +328,8 @@
                     <field name="product_id" select="1"/>
                     <field name="product_qty" select="1"/>
                     <field name="product_uom" select="1" string="UOM"/>
-                    <field name="prodlot_id" select="1"/>
-                    <field name="product_packaging" domain="[('product_id','=',product_id)]"/>
+                    <field name="prodlot_id" select="1" groups="base.group_extended"/>
+                    <field name="product_packaging" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
                     <field name="picking_id"/>
                     <field name="location_id" select="1"/>
                     <field name="location_dest_id" select="1"/>
@@ -338,12 +340,6 @@
             </field>
         </record>
 
-        <!--wizard
-            id="action_lot2"
-            model="stock.production.lot"
-            name="stock.traceability.lot.upstream"
-            string="Upstream traceability"/-->
-
         <!--wizard
             id="action_lot4"
             model="stock.production.lot"
@@ -400,15 +396,16 @@
             <field name="arch" type="xml">
                 <form string="Stock location">
                     <field name="name" select="1"/>
-                    <field name="active" select="2"/>
+                    <field name="active" groups="base.group_extended"/>
+                    <newline/>
                     <field name="usage" select="1"/>
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="base.group_extended"/>
                     <field name="location_id"/>
                     <field name="address_id" context="{'contact_display':'partner'}"/>
                     <field name="icon"/>
                     <newline/>
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" groups="base.group_extended">
                         <separator string="Chained Locations" colspan="2"/>
                         <field name="chained_location_type"/>
                         <field name="chained_location_id"/>
@@ -427,6 +424,25 @@
             </field>
         </record>
 
+        <record id="view_location_search" model="ir.ui.view">
+            <field name="name">stock.location.search</field>
+            <field name="model">stock.location</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Stock Locations">
+                    <filter icon="terp-stock" name="in_location"
+                        string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
+                    <filter icon="terp-stock" name="customer"
+                        string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
+                    <filter icon="terp-stock" name="supplier"
+                        string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
+
+
         <record id="view_location_tree2" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
@@ -448,7 +464,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_location_tree2"/>
-            <field name="context">{'full':'1'}</field>
+            <field name="context">{'full':1, 'search_default_in_location':1}</field>
         </record>
         <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration" />
 
@@ -579,8 +595,8 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1" readonly="1"/>
                         <field name="address_id" select="1" context="{'contact_display' : 'partner'}"/>
-                        <field name="origin" select="2"/>
-                        <field name="backorder_id" select="2" readonly="1"/>
+                        <field name="origin"/>
+                        <field name="backorder_id" readonly="1"/>
                         <field name="date" />
                         <field name="min_date" select="1"/>
                         <field name="type"/>
@@ -607,7 +623,7 @@
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UOM"/>
                                     <field name="picking_id" select="1"/>
-                                    <field name="prodlot_id"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
@@ -639,11 +655,11 @@
                                             <field name="date_planned"/>
                                             <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
                                             <field groups="base.group_extended" name="product_packaging"/>
-                                            <field name="prodlot_id" select="2"
+                                            <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
                                                 domain="[('product_id','=?',product_id)]"
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-                                            <field groups="base.group_extended" name="tracking_id" select="2"/>
+                                            <field groups="base.group_extended" name="tracking_id"/>
                                             <newline/>
                                             <label/>
                                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
@@ -656,7 +672,7 @@
                                                 <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                             </group>
                                         </page>
-                                        <page string="Return Picking History">
+                                        <page string="Return Picking History" groups="base.group_extended">
                                             <field name="move_stock_return_history" nolabel="1"/>
                                         </page>
                                     </notebook>
@@ -676,10 +692,10 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other info" groups="base.group_extended">
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <field name="auto_picking"/>
-                            <field name="invoice_state" select="2"/>
-                            <field name="date_done" select="2"/>
+                            <field name="invoice_state"/>
+                            <field name="date_done"/>
                             <newline/>
                             <field name="move_type"/>
                         </page>
@@ -695,7 +711,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Picking">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order"  />
@@ -742,8 +758,8 @@
                     <group col="6" colspan="4">
                         <field name="name" select="1" readonly="1"/>
                         <field name="address_id" select="1"/>
-                        <field name="origin" select="2"/>
-                        <field name="backorder_id" select="2" readonly="1"/>
+                        <field name="origin"/>
+                        <field name="backorder_id" readonly="1"/>
                         <field name="date" />
                         <field name="min_date" select="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
@@ -769,7 +785,7 @@
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UOM"/>
                                     <field name="picking_id" select="1"/>
-                                    <field name="prodlot_id"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
@@ -778,6 +794,7 @@
                                            name="%(stock.track_line)d"
                                            string="Split in production lots"
                                            type="action" icon="gtk-justify-fill"
+                                           groups="base.group_extended"
                                            states="draft,waiting,confirmed,assigned" />
                                        <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -799,7 +816,7 @@
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
                                             <field groups="base.group_extended" name="product_packaging"/>
-                                            <field name="prodlot_id" select="2"
+                                            <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
                                                 domain="[('product_id','=?',product_id)]"
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
@@ -833,10 +850,10 @@
                         </page>
                         <page string="Other info" groups="base.group_extended">
                             <field name="auto_picking"/>
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <newline/>
                             <field name="date" select="1"/>
-                            <field name="date_done" select="2"/>
+                            <field name="date_done"/>
                             <field name="move_type"/>
                         </page>
                     </notebook>
@@ -851,7 +868,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Delivery">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
@@ -877,7 +894,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','delivery')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_Available":1}</field>
+            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
@@ -929,12 +946,12 @@
             <field name="arch" type="xml">
                 <form string="Picking list">
                     <group col="6" colspan="4">
-                        <field name="address_id" select="2"/>
-                        <field name="min_date" select="2"/>
+                        <field name="address_id"/>
+                        <field name="min_date"/>
                         <field name="name" select="1" readonly="1"/>
                         <field name="invoice_state"/>
-                        <field name="backorder_id" select="2" readonly="1"/>
-                        <field name="origin" select="2" readonly="1"/>
+                        <field name="backorder_id" readonly="1"/>
+                        <field name="origin" readonly="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                         <button name="%(act_stock_make_picking_wizard)d"
                                 states="assigned"
@@ -958,7 +975,7 @@
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UOM"/>
                                     <field name="picking_id" select="1"/>
-                                    <field name="prodlot_id"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
@@ -989,7 +1006,7 @@
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
                                             <field groups="base.group_extended" name="product_packaging"/>
-                                            <field name="prodlot_id" select="1"
+                                            <field name="prodlot_id" select="1" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
                                                 domain="[('product_id','=?',product_id)]"
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
@@ -1024,11 +1041,11 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other info" groups="base.group_extended">
-                            <field name="active" select="2"/>
+                            <field name="active"/>
                             <field name="auto_picking"/>
                             <newline/>
-                            <field name="date" select="2"/>
-                            <field name="date_done" select="2"/>
+                            <field name="date"/>
+                            <field name="date_done"/>
                             <field name="move_type"/>
                         </page>
                     </notebook>
@@ -1116,12 +1133,12 @@
                 <form string="Input Picking List">
                     <group colspan="4" col="6">
                         <field name="name" readonly="1" select="1"/>
-                        <field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'contact_display':'partner'}"/>
-                        <field name="origin" select="2"/>
-                        <field name="backorder_id" select="2" readonly="1"/>
+                        <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}"/>
+                        <field name="origin"/>
+                        <field name="backorder_id" readonly="1"/>
                         <field name="date"/>
-                        <field name="min_date" select="2" readonly="1"/>
-                        <field name="invoice_state" select="2" string="Invoice Control"/>
+                        <field name="min_date" readonly="1"/>
+                        <field name="invoice_state" string="Invoice Control"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                         <button name="%(act_stock_make_picking_wizard)d"
                                 states="confirmed,assigned"
@@ -1144,7 +1161,7 @@
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
                                     <field name="location_dest_id"/>
-                                    <field name="prodlot_id"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -1173,7 +1190,7 @@
                                             <newline/>
                                             <field groups="base.group_extended" name="product_packaging"/>
                                             <newline/>
-                                            <field name="prodlot_id" select="1"
+                                            <field name="prodlot_id" select="1" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
                                                 domain="[('product_id','=?',product_id)]"
                                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
@@ -1224,7 +1241,7 @@
             <field name="arch" type="xml">
                 <search string="Input Picking List">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" />
                         <separator orientation="vertical"/>
@@ -1250,7 +1267,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_Available":1}</field>
+            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_in_search"/>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
@@ -1280,7 +1297,7 @@
                 <search string="Internal Picking List">
                     <group col="8" colspan="4">
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
+                        <filter icon="terp-stock" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="origin" select="1"/>
@@ -1303,7 +1320,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_Confirmed":1}</field>
+            <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
         <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
@@ -1320,7 +1337,7 @@
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                     <field name="product_uom" string="UOM"/>
                     <field name="picking_id" select="1"/>
-                    <field name="prodlot_id"/>
+                    <field name="prodlot_id" groups="base.group_extended"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
@@ -1342,19 +1359,19 @@
                         <page string="General Information">
                             <group colspan="2" col="2">
                                 <separator colspan="2" string="Move Information"/>
-                                <field name="name" select="2"/>
+                                <field name="name"/>
                                 <field name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
-                                <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                <field name="product_uom" select="2"/>
-                                <field name="product_uos" select="2"/>
+                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                <field name="product_uom"/>
+                                <field name="product_uos"/>
                             </group>
 
                             <group colspan="2" col="2">
                                 <separator string="Locations &amp; Picking" colspan="2" />
                                 <field name="location_id" select="1"/>
                                 <field name="location_dest_id" select="1"/>
-                                <field name="picking_id" select="2"/>
-                                <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
+                                <field name="picking_id"/>
+                                <field name="address_id" context="{'contact_display':'partner'}"/>
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             </group>
 
@@ -1368,7 +1385,7 @@
                             <group colspan="2" col="4">
                                 <separator string="Traceability" colspan="4" />
                                 <field name="tracking_id" select="1" colspan="4" />
-                                <field name="prodlot_id" select="2"
+                                <field name="prodlot_id" groups="base.group_extended"
                                     context="{'location_id':location_id, 'product_id':product_id}"
                                     domain="[('product_id','=?',product_id)]"
                                     on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
@@ -1398,13 +1415,12 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Moves"/>
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Moves"/>
-                        <filter icon="terp-stock" string="Waiting" domain="[('state','=','waiting')]" help="Waiting"/>
+                        <filter icon="terp-stock" string="Available" domain="[('state','=','done')]" help="Done"/>
+                        <filter icon="terp-stock" string="Available" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Future"/>
                         <separator orientation="vertical"/>
-                        <field name="location_id" select="1"/>
-                        <field name="location_dest_id" select="1"/>
-                        <field name="product_id" select="1"/>
+                        <field name="location_id"/>
+                        <field name="location_dest_id"/>
+                        <field name="product_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
@@ -1439,12 +1455,12 @@
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancel','done');black:state not in ('cancel','done')" string="Moves">
                     <field name="picking_id" string="Reference"/>
-                    <field name="origin" string="Latest Requisition"/>
+                    <field name="origin" string="Latest Procurement"/>
                     <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
                     <field name="product_uom" string="UOM"/>
-                    <field name="prodlot_id" string="Lot"/>
+                    <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
                     <field name="date_planned"/>
                     <field name="backorder_id"/>
                     <field name="state"/>
@@ -1464,31 +1480,31 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <separator colspan="4" string="Move Information"/>
-                            <field name="location_id" select="1"/>
-                            <field name="location_dest_id" select="1"/>
-                            <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
-                            <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                            <field name="product_uom" select="2"/>
-                            <field name="product_uos" select="2"/>
-                            <field colspan="4" name="name" select="2"/>
+                            <field name="location_id"/>
+                            <field name="location_dest_id"/>
+                            <field colspan="4" name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
+                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                            <field name="product_uom"/>
+                            <field name="product_uos"/>
+                            <field colspan="4" name="name"/>
                             <field name="date"/>
-                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="date_planned"/>
                             <field name="priority"/>
-                            <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
+                            <field name="address_id" context="{'contact_display':'partner'}"/>
                             <newline/>
-                            <field name="picking_id" select="2"/>
+                            <field name="picking_id"/>
                             <newline/>
-                            <field name="prodlot_id" select="2"
+                            <field name="prodlot_id" groups="base.group_extended"
                                 context="{'location_id':location_id, 'product_id':product_id}"
                                 domain="[('product_id','=?',product_id)]"
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-                            <field name="tracking_id" select="2"/>
+                            <field name="tracking_id"/>
                             <newline/>
                             <label/>
                             <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                             <separator colspan="4" string="Move State"/>
-                            <field name="state" select="1"/>
+                            <field name="state"/>
                             <group col="5" colspan="2">
                                 <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                 <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
@@ -1513,12 +1529,12 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
+                        <filter icon="terp-stock" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
                         <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
                         <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin" string="Latest Requisition" select="1"/>
-                        <field name="partner_id" string="Supplier" select="1"/>
+                        <field name="origin" string="Latest Procurement"/>
+                        <field name="partner_id" string="Supplier"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
@@ -1539,7 +1555,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context">{"search_default_To Receive":1}</field>
+            <field name="context">{"search_default_receive":1}</field>
             <field name="search_view_id" ref="view_move_search_reception_picking"/>
         </record>
 
@@ -1568,7 +1584,7 @@
             <field name="arch" type="xml">
                 <tree string="Incoterms">
                     <field name="code"/>
-                    <field colspan="4" name="name" select="1"/>
+                    <field colspan="4" name="name"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/stock_invoice_directly/__terp__.py b/addons/stock_invoice_directly/__openerp__.py
similarity index 100%
rename from addons/stock_invoice_directly/__terp__.py
rename to addons/stock_invoice_directly/__openerp__.py
diff --git a/addons/stock_invoice_directly/i18n/ar.po b/addons/stock_invoice_directly/i18n/ar.po
index c865f35462a..b0015c39163 100644
--- a/addons/stock_invoice_directly/i18n/ar.po
+++ b/addons/stock_invoice_directly/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/bg.po b/addons/stock_invoice_directly/i18n/bg.po
index c32536822cd..c65cb49cceb 100644
--- a/addons/stock_invoice_directly/i18n/bg.po
+++ b/addons/stock_invoice_directly/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/bs.po b/addons/stock_invoice_directly/i18n/bs.po
index e56ad1f9bf4..0b47fe7cb47 100644
--- a/addons/stock_invoice_directly/i18n/bs.po
+++ b/addons/stock_invoice_directly/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/ca.po b/addons/stock_invoice_directly/i18n/ca.po
index 719d6ecd461..dfa19a3e0e7 100644
--- a/addons/stock_invoice_directly/i18n/ca.po
+++ b/addons/stock_invoice_directly/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/cs.po b/addons/stock_invoice_directly/i18n/cs.po
index 4d7d231da28..c9c77a73135 100644
--- a/addons/stock_invoice_directly/i18n/cs.po
+++ b/addons/stock_invoice_directly/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/da.po b/addons/stock_invoice_directly/i18n/da.po
index 50d2fdf5f5d..e3bca90e3b8 100644
--- a/addons/stock_invoice_directly/i18n/da.po
+++ b/addons/stock_invoice_directly/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/de.po b/addons/stock_invoice_directly/i18n/de.po
index 2e0815bc243..120c7956841 100644
--- a/addons/stock_invoice_directly/i18n/de.po
+++ b/addons/stock_invoice_directly/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/el.po b/addons/stock_invoice_directly/i18n/el.po
index 04c9ab10717..b83bda52485 100644
--- a/addons/stock_invoice_directly/i18n/el.po
+++ b/addons/stock_invoice_directly/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/es.po b/addons/stock_invoice_directly/i18n/es.po
index 078b9b2ae4e..68c408cb6b7 100644
--- a/addons/stock_invoice_directly/i18n/es.po
+++ b/addons/stock_invoice_directly/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/es_AR.po b/addons/stock_invoice_directly/i18n/es_AR.po
index 16f46c259f2..8d26892f4e3 100644
--- a/addons/stock_invoice_directly/i18n/es_AR.po
+++ b/addons/stock_invoice_directly/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/et.po b/addons/stock_invoice_directly/i18n/et.po
index d9817e5cefb..bab5cd2201f 100644
--- a/addons/stock_invoice_directly/i18n/et.po
+++ b/addons/stock_invoice_directly/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/fr.po b/addons/stock_invoice_directly/i18n/fr.po
index d9f45d04bbc..3467771b8bb 100644
--- a/addons/stock_invoice_directly/i18n/fr.po
+++ b/addons/stock_invoice_directly/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/gl.po b/addons/stock_invoice_directly/i18n/gl.po
index bddbe522b9f..4bf53b2c24b 100644
--- a/addons/stock_invoice_directly/i18n/gl.po
+++ b/addons/stock_invoice_directly/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/hr.po b/addons/stock_invoice_directly/i18n/hr.po
index e692c2f4c81..01aeb9bcb6a 100644
--- a/addons/stock_invoice_directly/i18n/hr.po
+++ b/addons/stock_invoice_directly/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/hu.po b/addons/stock_invoice_directly/i18n/hu.po
index c865f35462a..b0015c39163 100644
--- a/addons/stock_invoice_directly/i18n/hu.po
+++ b/addons/stock_invoice_directly/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/id.po b/addons/stock_invoice_directly/i18n/id.po
index f9e7652ea93..00b2f120eba 100644
--- a/addons/stock_invoice_directly/i18n/id.po
+++ b/addons/stock_invoice_directly/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/it.po b/addons/stock_invoice_directly/i18n/it.po
index c865f35462a..b0015c39163 100644
--- a/addons/stock_invoice_directly/i18n/it.po
+++ b/addons/stock_invoice_directly/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/ko.po b/addons/stock_invoice_directly/i18n/ko.po
index 96ac4d3652c..ec5d5de2cc6 100644
--- a/addons/stock_invoice_directly/i18n/ko.po
+++ b/addons/stock_invoice_directly/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/lt.po b/addons/stock_invoice_directly/i18n/lt.po
index c865f35462a..b0015c39163 100644
--- a/addons/stock_invoice_directly/i18n/lt.po
+++ b/addons/stock_invoice_directly/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/nl.po b/addons/stock_invoice_directly/i18n/nl.po
index e159dd6b4f2..2a0c5194168 100644
--- a/addons/stock_invoice_directly/i18n/nl.po
+++ b/addons/stock_invoice_directly/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/nl_BE.po b/addons/stock_invoice_directly/i18n/nl_BE.po
index 3d473a99e06..338c1add0c5 100644
--- a/addons/stock_invoice_directly/i18n/nl_BE.po
+++ b/addons/stock_invoice_directly/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/pl.po b/addons/stock_invoice_directly/i18n/pl.po
index 38da0f68b07..c79a3f567f1 100644
--- a/addons/stock_invoice_directly/i18n/pl.po
+++ b/addons/stock_invoice_directly/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/pt.po b/addons/stock_invoice_directly/i18n/pt.po
index c865f35462a..b0015c39163 100644
--- a/addons/stock_invoice_directly/i18n/pt.po
+++ b/addons/stock_invoice_directly/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/pt_BR.po b/addons/stock_invoice_directly/i18n/pt_BR.po
index 3e9c0d43768..f829ae583df 100644
--- a/addons/stock_invoice_directly/i18n/pt_BR.po
+++ b/addons/stock_invoice_directly/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/ro.po b/addons/stock_invoice_directly/i18n/ro.po
index 7c74a37bf11..a30686bb00c 100644
--- a/addons/stock_invoice_directly/i18n/ro.po
+++ b/addons/stock_invoice_directly/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/ru.po b/addons/stock_invoice_directly/i18n/ru.po
index c865f35462a..b0015c39163 100644
--- a/addons/stock_invoice_directly/i18n/ru.po
+++ b/addons/stock_invoice_directly/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/sl.po b/addons/stock_invoice_directly/i18n/sl.po
index a229402a268..0d1063b1ef2 100644
--- a/addons/stock_invoice_directly/i18n/sl.po
+++ b/addons/stock_invoice_directly/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/sr.po b/addons/stock_invoice_directly/i18n/sr.po
index 6288a441873..e3381f7c56e 100644
--- a/addons/stock_invoice_directly/i18n/sr.po
+++ b/addons/stock_invoice_directly/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/sv.po b/addons/stock_invoice_directly/i18n/sv.po
index c865f35462a..b0015c39163 100644
--- a/addons/stock_invoice_directly/i18n/sv.po
+++ b/addons/stock_invoice_directly/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index 50e1f63e40b..c356029042d 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/uk.po b/addons/stock_invoice_directly/i18n/uk.po
index a7bccec01f6..3bf70ab4342 100644
--- a/addons/stock_invoice_directly/i18n/uk.po
+++ b/addons/stock_invoice_directly/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/zh_CN.po b/addons/stock_invoice_directly/i18n/zh_CN.po
index 54e5a6726a0..d7a024e9c27 100644
--- a/addons/stock_invoice_directly/i18n/zh_CN.po
+++ b/addons/stock_invoice_directly/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/zh_TW.po b/addons/stock_invoice_directly/i18n/zh_TW.po
index c865f35462a..b0015c39163 100644
--- a/addons/stock_invoice_directly/i18n/zh_TW.po
+++ b/addons/stock_invoice_directly/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_location/__terp__.py b/addons/stock_location/__openerp__.py
similarity index 100%
rename from addons/stock_location/__terp__.py
rename to addons/stock_location/__openerp__.py
diff --git a/addons/stock_location/i18n/ar.po b/addons/stock_location/i18n/ar.po
index 7afae20036c..be80d1e4656 100644
--- a/addons/stock_location/i18n/ar.po
+++ b/addons/stock_location/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/bg.po b/addons/stock_location/i18n/bg.po
index f4bb04a4dab..9353cf48629 100644
--- a/addons/stock_location/i18n/bg.po
+++ b/addons/stock_location/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/bs.po b/addons/stock_location/i18n/bs.po
index 0e20f8a8677..e03274a0a65 100644
--- a/addons/stock_location/i18n/bs.po
+++ b/addons/stock_location/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/ca.po b/addons/stock_location/i18n/ca.po
index 5ff5f8de5b0..be4ef2e6e95 100644
--- a/addons/stock_location/i18n/ca.po
+++ b/addons/stock_location/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/cs.po b/addons/stock_location/i18n/cs.po
index ae272934c2c..f745858641e 100644
--- a/addons/stock_location/i18n/cs.po
+++ b/addons/stock_location/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/de.po b/addons/stock_location/i18n/de.po
index f2979f1baf4..cc8030e28f7 100644
--- a/addons/stock_location/i18n/de.po
+++ b/addons/stock_location/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/el.po b/addons/stock_location/i18n/el.po
index 98ecab1b0dd..c055a88b060 100644
--- a/addons/stock_location/i18n/el.po
+++ b/addons/stock_location/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po
index 775bb2a9112..da92b85c994 100644
--- a/addons/stock_location/i18n/es.po
+++ b/addons/stock_location/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/es_AR.po b/addons/stock_location/i18n/es_AR.po
index b0833c93024..f3e26b0270e 100644
--- a/addons/stock_location/i18n/es_AR.po
+++ b/addons/stock_location/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/et.po b/addons/stock_location/i18n/et.po
index 4c0fc759520..1164129baba 100644
--- a/addons/stock_location/i18n/et.po
+++ b/addons/stock_location/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/fr.po b/addons/stock_location/i18n/fr.po
index 51b060e7c34..bd30d13a5db 100644
--- a/addons/stock_location/i18n/fr.po
+++ b/addons/stock_location/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/hr.po b/addons/stock_location/i18n/hr.po
index b9c11ada97e..081b1ada056 100644
--- a/addons/stock_location/i18n/hr.po
+++ b/addons/stock_location/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/hu.po b/addons/stock_location/i18n/hu.po
index 32e60ae4365..cd587dd449d 100644
--- a/addons/stock_location/i18n/hu.po
+++ b/addons/stock_location/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/id.po b/addons/stock_location/i18n/id.po
index 215e8e9a66f..81a89415804 100644
--- a/addons/stock_location/i18n/id.po
+++ b/addons/stock_location/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/it.po b/addons/stock_location/i18n/it.po
index c5caf60bcfa..b38487e9fdf 100644
--- a/addons/stock_location/i18n/it.po
+++ b/addons/stock_location/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/ko.po b/addons/stock_location/i18n/ko.po
index 79371a69a1e..0ea774319a8 100644
--- a/addons/stock_location/i18n/ko.po
+++ b/addons/stock_location/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/lt.po b/addons/stock_location/i18n/lt.po
index 12c89fc3575..f74634e623b 100644
--- a/addons/stock_location/i18n/lt.po
+++ b/addons/stock_location/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/nl.po b/addons/stock_location/i18n/nl.po
index 60a23f3e2c9..2458c2810fb 100644
--- a/addons/stock_location/i18n/nl.po
+++ b/addons/stock_location/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/nl_BE.po b/addons/stock_location/i18n/nl_BE.po
index f166a10d5c1..a12f9f2a34b 100644
--- a/addons/stock_location/i18n/nl_BE.po
+++ b/addons/stock_location/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/pl.po b/addons/stock_location/i18n/pl.po
index ba4ab973fa4..6b325759514 100644
--- a/addons/stock_location/i18n/pl.po
+++ b/addons/stock_location/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/pt.po b/addons/stock_location/i18n/pt.po
index b1f561fc0fc..7673144975e 100644
--- a/addons/stock_location/i18n/pt.po
+++ b/addons/stock_location/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/pt_BR.po b/addons/stock_location/i18n/pt_BR.po
index 2f3279a1106..b262b87030e 100644
--- a/addons/stock_location/i18n/pt_BR.po
+++ b/addons/stock_location/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/ro.po b/addons/stock_location/i18n/ro.po
index 7afae20036c..f2ff67190e6 100644
--- a/addons/stock_location/i18n/ro.po
+++ b/addons/stock_location/i18n/ro.po
@@ -7,77 +7,81 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-04-15 11:04+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0
 msgid "Number of days to do this transition"
-msgstr ""
+msgstr "Număr de zile pentru efectuarea acestei tranziţii"
 
 #. module: stock_location
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: stock_location
 #: model:ir.module.module,shortdesc:stock_location.module_meta_information
 msgid "Stock Location Paths"
-msgstr ""
+msgstr "Trasee locaţii de stocare"
 
 #. module: stock_location
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+"special !"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
 msgid "Automatic No Step Added"
-msgstr ""
+msgstr "Automatic fără adăugare de paşi"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
 msgid ""
 "These rules set the right path of the product in the whole location tree."
 msgstr ""
+"Aceste reguli stabilesc traseul corect spre produs în întregul arbore de "
+"locaţii."
 
 #. module: stock_location
 #: field:stock.location.path,location_from_id:0
 msgid "Source Location"
-msgstr ""
+msgstr "Locaţie Sursă"
 
 #. module: stock_location
 #: field:stock.location.path,location_dest_id:0
 msgid "Destination Location"
-msgstr ""
+msgstr "Locaţie destinaţie"
 
 #. module: stock_location
 #: field:stock.location.path,auto:0
 #: selection:stock.location.path,auto:0
 msgid "Automatic Move"
-msgstr ""
+msgstr "Mişcare automată"
 
 #. module: stock_location
 #: field:stock.location.path,product_id:0
 msgid "Products"
-msgstr ""
+msgstr "Produse"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
 msgid "Manual Operation"
-msgstr ""
+msgstr "Operare manuală"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
 msgid "stock.location.path"
-msgstr ""
+msgstr "stock.location.path"
 
 #. module: stock_location
 #: help:stock.location.path,auto:0
@@ -89,25 +93,31 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"Se foloseşte pentru definirea traseului de urmat pentru produs în arborele "
+"de locaţii.\n"
+"Valoarea 'Mişcare automată' va crea o mişcare de stoc după cea curentă şi va "
+"fi validată automat. Cu 'Operare manuală', mişcarea de stoc va trebui "
+"validată de un operator. Cu 'Automat fără adăugare de paşi' locaţia este "
+"înlocuită în mişcarea originală."
 
 #. module: stock_location
 #: field:stock.location.path,name:0
 msgid "Operation"
-msgstr ""
+msgstr "Operație"
 
 #. module: stock_location
 #: view:product.product:0
 #: field:product.product,path_ids:0
 #: view:stock.location.path:0
 msgid "Location Paths"
-msgstr ""
+msgstr "Trasee locaţii"
 
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
-msgstr ""
+msgstr "Întârziere (zile)"
 
 #. module: stock_location
 #: view:product.product:0
 msgid "Procurement & Locations"
-msgstr ""
+msgstr "Aprovizionare & Locaţii"
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index 1e65997772f..a9db1dee35a 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/sl.po b/addons/stock_location/i18n/sl.po
index 4520d154544..a80716c83f8 100644
--- a/addons/stock_location/i18n/sl.po
+++ b/addons/stock_location/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/sv.po b/addons/stock_location/i18n/sv.po
index a9ac43474c7..262095e8251 100644
--- a/addons/stock_location/i18n/sv.po
+++ b/addons/stock_location/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/tlh.po b/addons/stock_location/i18n/tlh.po
index a6d55522808..d5b05f1c4c4 100644
--- a/addons/stock_location/i18n/tlh.po
+++ b/addons/stock_location/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 2e551eb20d5..f17505a6dae 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/uk.po b/addons/stock_location/i18n/uk.po
index 9b7b62dd798..4f8ddbb9191 100644
--- a/addons/stock_location/i18n/uk.po
+++ b/addons/stock_location/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po
index 5221e0f26ce..65244a6e2ce 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/zh_TW.po b/addons/stock_location/i18n/zh_TW.po
index b539d6aff84..c4ef7a9df03 100644
--- a/addons/stock_location/i18n/zh_TW.po
+++ b/addons/stock_location/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/stock_view.xml b/addons/stock_location/stock_view.xml
index b3730cb4979..f7ba12fe480 100644
--- a/addons/stock_location/stock_view.xml
+++ b/addons/stock_location/stock_view.xml
@@ -40,8 +40,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <page string="Requisition &amp; Locations">
-                    <field name="path_ids" editable="bottom" colspan="4" nolabel="1">
+                <page string="Procurement &amp; Locations">
+                    <field name="path_ids" editable="bottom" colspan="4" nolabel="1" groups="base.group_extended">
                         <tree string="Location Paths" editable="bottom">
                             <field name="location_from_id"/>
                             <field name="location_dest_id"/>
diff --git a/addons/stock_no_autopicking/__terp__.py b/addons/stock_no_autopicking/__openerp__.py
similarity index 100%
rename from addons/stock_no_autopicking/__terp__.py
rename to addons/stock_no_autopicking/__openerp__.py
diff --git a/addons/stock_no_autopicking/i18n/ar.po b/addons/stock_no_autopicking/i18n/ar.po
index cb04287635e..4c2173dbb37 100644
--- a/addons/stock_no_autopicking/i18n/ar.po
+++ b/addons/stock_no_autopicking/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/bg.po b/addons/stock_no_autopicking/i18n/bg.po
index 93247d12ffa..4779887a68a 100644
--- a/addons/stock_no_autopicking/i18n/bg.po
+++ b/addons/stock_no_autopicking/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/bs.po b/addons/stock_no_autopicking/i18n/bs.po
index 75c4d262e1c..4c7fb04ce6e 100644
--- a/addons/stock_no_autopicking/i18n/bs.po
+++ b/addons/stock_no_autopicking/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/ca.po b/addons/stock_no_autopicking/i18n/ca.po
index c00313cd399..da668333e3c 100644
--- a/addons/stock_no_autopicking/i18n/ca.po
+++ b/addons/stock_no_autopicking/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/cs.po b/addons/stock_no_autopicking/i18n/cs.po
index 7847394fae7..b70e985c236 100644
--- a/addons/stock_no_autopicking/i18n/cs.po
+++ b/addons/stock_no_autopicking/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/da.po b/addons/stock_no_autopicking/i18n/da.po
index deb59d54348..494e1c97269 100644
--- a/addons/stock_no_autopicking/i18n/da.po
+++ b/addons/stock_no_autopicking/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/de.po b/addons/stock_no_autopicking/i18n/de.po
index 81ac10d5294..5c98888fbd2 100644
--- a/addons/stock_no_autopicking/i18n/de.po
+++ b/addons/stock_no_autopicking/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/el.po b/addons/stock_no_autopicking/i18n/el.po
index 7460ac5f878..7ffa17247a1 100644
--- a/addons/stock_no_autopicking/i18n/el.po
+++ b/addons/stock_no_autopicking/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/stock_no_autopicking/i18n/es.po b/addons/stock_no_autopicking/i18n/es.po
index 8990f99d7b5..a1a3aa77f8f 100644
--- a/addons/stock_no_autopicking/i18n/es.po
+++ b/addons/stock_no_autopicking/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/es_AR.po b/addons/stock_no_autopicking/i18n/es_AR.po
index af32bb4f499..7a017222c84 100644
--- a/addons/stock_no_autopicking/i18n/es_AR.po
+++ b/addons/stock_no_autopicking/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/et.po b/addons/stock_no_autopicking/i18n/et.po
index 2fafc927f1a..cc2bed34059 100644
--- a/addons/stock_no_autopicking/i18n/et.po
+++ b/addons/stock_no_autopicking/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/fr.po b/addons/stock_no_autopicking/i18n/fr.po
index af3e2218d69..b21e2644892 100644
--- a/addons/stock_no_autopicking/i18n/fr.po
+++ b/addons/stock_no_autopicking/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/gl.po b/addons/stock_no_autopicking/i18n/gl.po
index 5f4efa050ce..2b8d92f2494 100644
--- a/addons/stock_no_autopicking/i18n/gl.po
+++ b/addons/stock_no_autopicking/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/hr.po b/addons/stock_no_autopicking/i18n/hr.po
index 848007211df..80b37c8aabb 100644
--- a/addons/stock_no_autopicking/i18n/hr.po
+++ b/addons/stock_no_autopicking/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/hu.po b/addons/stock_no_autopicking/i18n/hu.po
index 2ea9686518e..8bb8436bf72 100644
--- a/addons/stock_no_autopicking/i18n/hu.po
+++ b/addons/stock_no_autopicking/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/id.po b/addons/stock_no_autopicking/i18n/id.po
index 41a79148326..ba2084f132b 100644
--- a/addons/stock_no_autopicking/i18n/id.po
+++ b/addons/stock_no_autopicking/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/it.po b/addons/stock_no_autopicking/i18n/it.po
index 564dd1c9d67..60db68f6bcf 100644
--- a/addons/stock_no_autopicking/i18n/it.po
+++ b/addons/stock_no_autopicking/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/ko.po b/addons/stock_no_autopicking/i18n/ko.po
index 00ebeab629d..ee8dab0914f 100644
--- a/addons/stock_no_autopicking/i18n/ko.po
+++ b/addons/stock_no_autopicking/i18n/ko.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:34+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-04-15 00:45+0000\n"
+"Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
 
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
diff --git a/addons/stock_no_autopicking/i18n/lt.po b/addons/stock_no_autopicking/i18n/lt.po
index 2ea9686518e..8bb8436bf72 100644
--- a/addons/stock_no_autopicking/i18n/lt.po
+++ b/addons/stock_no_autopicking/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/nl.po b/addons/stock_no_autopicking/i18n/nl.po
index a4e408dbecd..6355a6349b8 100644
--- a/addons/stock_no_autopicking/i18n/nl.po
+++ b/addons/stock_no_autopicking/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/nl_BE.po b/addons/stock_no_autopicking/i18n/nl_BE.po
index abc1d386b46..d8c1275e5e7 100644
--- a/addons/stock_no_autopicking/i18n/nl_BE.po
+++ b/addons/stock_no_autopicking/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/pl.po b/addons/stock_no_autopicking/i18n/pl.po
index e2adf967cda..1081254d98d 100644
--- a/addons/stock_no_autopicking/i18n/pl.po
+++ b/addons/stock_no_autopicking/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/pt.po b/addons/stock_no_autopicking/i18n/pt.po
index 18affd463d0..dbb6b9df2aa 100644
--- a/addons/stock_no_autopicking/i18n/pt.po
+++ b/addons/stock_no_autopicking/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/pt_BR.po b/addons/stock_no_autopicking/i18n/pt_BR.po
index 4eca7cd627d..d94b55c06a3 100644
--- a/addons/stock_no_autopicking/i18n/pt_BR.po
+++ b/addons/stock_no_autopicking/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/ro.po b/addons/stock_no_autopicking/i18n/ro.po
index ad5c0ba0f39..e31fe6c9326 100644
--- a/addons/stock_no_autopicking/i18n/ro.po
+++ b/addons/stock_no_autopicking/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/ru.po b/addons/stock_no_autopicking/i18n/ru.po
index 3b2d947a3b7..d25b03fa58c 100644
--- a/addons/stock_no_autopicking/i18n/ru.po
+++ b/addons/stock_no_autopicking/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/sl.po b/addons/stock_no_autopicking/i18n/sl.po
index 1229cddb84c..b9791b096f3 100644
--- a/addons/stock_no_autopicking/i18n/sl.po
+++ b/addons/stock_no_autopicking/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/sv.po b/addons/stock_no_autopicking/i18n/sv.po
index 9c7af9b3964..ea1310a3b93 100644
--- a/addons/stock_no_autopicking/i18n/sv.po
+++ b/addons/stock_no_autopicking/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/tlh.po b/addons/stock_no_autopicking/i18n/tlh.po
index 54178aa5aad..6d79e4d2ced 100644
--- a/addons/stock_no_autopicking/i18n/tlh.po
+++ b/addons/stock_no_autopicking/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index 9e41c50c090..68791754f9c 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/uk.po b/addons/stock_no_autopicking/i18n/uk.po
index 7a1e3c81619..882399f2038 100644
--- a/addons/stock_no_autopicking/i18n/uk.po
+++ b/addons/stock_no_autopicking/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po
index 95a60490b51..de0d8157ba0 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/zh_TW.po b/addons/stock_no_autopicking/i18n/zh_TW.po
index eee86550cc8..cd92b751193 100644
--- a/addons/stock_no_autopicking/i18n/zh_TW.po
+++ b/addons/stock_no_autopicking/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/stock_no_autopicking_view.xml b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
index c24888245b3..94ab02a662d 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking_view.xml
+++ b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<record model="ir.ui.view" id="view_product_form_auto_pick">
-			<field name="name">product.normal.auto_pick.form</field>
-			<field name="model">product.product</field>
-			<field name="inherit_id" ref="product.product_normal_form_view" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="product_manager" position="after">
-					<field name="auto_pick" />
-				</field>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_product_form_auto_pick">
+            <field name="name">product.normal.auto_pick.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="product_manager" position="after">
+                    <field name="auto_pick" />
+                </field>
+            </field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/stock_planning/__terp__.py b/addons/stock_planning/__openerp__.py
similarity index 100%
rename from addons/stock_planning/__terp__.py
rename to addons/stock_planning/__openerp__.py
diff --git a/addons/subscription/__terp__.py b/addons/subscription/__openerp__.py
similarity index 100%
rename from addons/subscription/__terp__.py
rename to addons/subscription/__openerp__.py
diff --git a/addons/subscription/i18n/ar.po b/addons/subscription/i18n/ar.po
index 46d0bd6551f..856b0b1e948 100644
--- a/addons/subscription/i18n/ar.po
+++ b/addons/subscription/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/bg.po b/addons/subscription/i18n/bg.po
index 14f221cfbe8..e9471ecb2ef 100644
--- a/addons/subscription/i18n/bg.po
+++ b/addons/subscription/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/bs.po b/addons/subscription/i18n/bs.po
index 020ef4a6f59..39d817bd6fd 100644
--- a/addons/subscription/i18n/bs.po
+++ b/addons/subscription/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ca.po b/addons/subscription/i18n/ca.po
index 3a10a448e03..2249ff856c5 100644
--- a/addons/subscription/i18n/ca.po
+++ b/addons/subscription/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/cs.po b/addons/subscription/i18n/cs.po
index 1c0ca78dee2..085ed30f439 100644
--- a/addons/subscription/i18n/cs.po
+++ b/addons/subscription/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/de.po b/addons/subscription/i18n/de.po
index c29e3335df3..83c31832732 100644
--- a/addons/subscription/i18n/de.po
+++ b/addons/subscription/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/es.po b/addons/subscription/i18n/es.po
index ef23ab3e09f..033503e452c 100644
--- a/addons/subscription/i18n/es.po
+++ b/addons/subscription/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/es_AR.po b/addons/subscription/i18n/es_AR.po
index d4f21844b13..2bf00a4ccf5 100644
--- a/addons/subscription/i18n/es_AR.po
+++ b/addons/subscription/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/et.po b/addons/subscription/i18n/et.po
index c4954fbf6ae..9b97a40e0fe 100644
--- a/addons/subscription/i18n/et.po
+++ b/addons/subscription/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/fr.po b/addons/subscription/i18n/fr.po
index 785fa4b877d..e6b7f722da1 100644
--- a/addons/subscription/i18n/fr.po
+++ b/addons/subscription/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/hr.po b/addons/subscription/i18n/hr.po
index 46d0bd6551f..856b0b1e948 100644
--- a/addons/subscription/i18n/hr.po
+++ b/addons/subscription/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/hu.po b/addons/subscription/i18n/hu.po
index 46d0bd6551f..856b0b1e948 100644
--- a/addons/subscription/i18n/hu.po
+++ b/addons/subscription/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/id.po b/addons/subscription/i18n/id.po
index 1d1ec68997a..539f72c541f 100644
--- a/addons/subscription/i18n/id.po
+++ b/addons/subscription/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/it.po b/addons/subscription/i18n/it.po
index 2222a48bc93..28c9ee000eb 100644
--- a/addons/subscription/i18n/it.po
+++ b/addons/subscription/i18n/it.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-09-08 16:29+0000\n"
-"Last-Translator: Davide Corio <davide.corio@domsense.com>\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-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ko.po b/addons/subscription/i18n/ko.po
index cc8f3ca3833..48e7b534227 100644
--- a/addons/subscription/i18n/ko.po
+++ b/addons/subscription/i18n/ko.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: 2009-09-08 15:16+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-04-15 01:06+0000\n"
+"Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-21 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -62,7 +62,7 @@ msgstr "현재 날짜"
 #. module: subscription
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "액션 정의에 잘못된 모델 이름이 있습니다."
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
diff --git a/addons/subscription/i18n/lt.po b/addons/subscription/i18n/lt.po
index c84d38d2c23..c005c47d140 100644
--- a/addons/subscription/i18n/lt.po
+++ b/addons/subscription/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/nl.po b/addons/subscription/i18n/nl.po
index 5273f53f2fd..ec2e89eb047 100644
--- a/addons/subscription/i18n/nl.po
+++ b/addons/subscription/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/nl_BE.po b/addons/subscription/i18n/nl_BE.po
index e6ed1aa89d8..1e37ab06ed5 100644
--- a/addons/subscription/i18n/nl_BE.po
+++ b/addons/subscription/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index 8c78b77dd9b..ecca1a5cb35 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/pt.po b/addons/subscription/i18n/pt.po
index 3ed8c333aeb..412771260bd 100644
--- a/addons/subscription/i18n/pt.po
+++ b/addons/subscription/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/pt_BR.po b/addons/subscription/i18n/pt_BR.po
index 36422d387ec..91cafe89b7e 100644
--- a/addons/subscription/i18n/pt_BR.po
+++ b/addons/subscription/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ro.po b/addons/subscription/i18n/ro.po
index 46d0bd6551f..856b0b1e948 100644
--- a/addons/subscription/i18n/ro.po
+++ b/addons/subscription/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/ru.po b/addons/subscription/i18n/ru.po
index 347503d70b8..3ed71f2a29a 100644
--- a/addons/subscription/i18n/ru.po
+++ b/addons/subscription/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/sl.po b/addons/subscription/i18n/sl.po
index ce2e0aa376c..deea8297990 100644
--- a/addons/subscription/i18n/sl.po
+++ b/addons/subscription/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/sv.po b/addons/subscription/i18n/sv.po
index cefe94a4401..6c4f37397bf 100644
--- a/addons/subscription/i18n/sv.po
+++ b/addons/subscription/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/tlh.po b/addons/subscription/i18n/tlh.po
index e99e78d0806..5f428cb8982 100644
--- a/addons/subscription/i18n/tlh.po
+++ b/addons/subscription/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 3a552a0f454..2106d583681 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/uk.po b/addons/subscription/i18n/uk.po
index 1958caf7aad..84ab64e4fa2 100644
--- a/addons/subscription/i18n/uk.po
+++ b/addons/subscription/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/zh_CN.po b/addons/subscription/i18n/zh_CN.po
index cb49e2c72d2..d7845a0f5d7 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/zh_TW.po b/addons/subscription/i18n/zh_TW.po
index c2af7106b97..f6d8cede89a 100644
--- a/addons/subscription/i18n/zh_TW.po
+++ b/addons/subscription/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 699896e3040..84c7c41207a 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -2,14 +2,13 @@
 <openerp>
     <data>
         <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
-       <!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
-<!--        <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->
+
         <!--
-	=======================================================
-	Subscription Views
-	=======================================================
-	-->
+        =======================================================
+        Subscription Views
+        =======================================================
+        -->
         <record id="view_subscription_form" model="ir.ui.view">
             <field name="name">subscription.subscription.form</field>
             <field name="model">subscription.subscription</field>
@@ -18,7 +17,7 @@
                 <form string="Subscriptions">
                     <group colspan="4">
                         <field name="name" select="1"/>
-                        <field name="active" select="1"/>
+                        <field name="active" select="1" groups="base.group_extended"/>
                         <field name="user_id" select="1"/>
                         <field name="partner_id" select="1"/>
                     </group>
@@ -55,7 +54,7 @@
             <field name="arch" type="xml">
                 <tree string="Subscriptions">
                     <field name="name"/>
-                    <field name="active"/>
+                    <field name="active" groups="base.group_extended"/>
                     <field name="user_id"/>
                     <field name="partner_id"/>
                     <field name="state"/>
diff --git a/addons/survey/__terp__.py b/addons/survey/__openerp__.py
similarity index 100%
rename from addons/survey/__terp__.py
rename to addons/survey/__openerp__.py
diff --git a/addons/survey/i18n/bg.po b/addons/survey/i18n/bg.po
index 568151620ea..54535c1f79e 100644
--- a/addons/survey/i18n/bg.po
+++ b/addons/survey/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
diff --git a/addons/survey/i18n/cs.po b/addons/survey/i18n/cs.po
index d29b616d5f9..e72aef4d8ab 100644
--- a/addons/survey/i18n/cs.po
+++ b/addons/survey/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
index 558afcd8aea..cc27012b24c 100644
--- a/addons/survey/i18n/de.po
+++ b/addons/survey/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
diff --git a/addons/survey/i18n/hr.po b/addons/survey/i18n/hr.po
index b03acba3435..b652ccf0225 100644
--- a/addons/survey/i18n/hr.po
+++ b/addons/survey/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/survey/i18n/sl.po b/addons/survey/i18n/sl.po
index 8cbf8e5e4f4..990c1f8d121 100644
--- a/addons/survey/i18n/sl.po
+++ b/addons/survey/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
index 428c5dffe07..11deb3583d9 100644
--- a/addons/survey/i18n/zh_CN.po
+++ b/addons/survey/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-10 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 7cb308d10d8..968590a5d07 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -128,6 +128,7 @@ class survey(osv.osv):
                 'context' : context
             }
         else:
+            
             datas['form'] = page_setting
             datas['model'] = 'survey.print'
             report = {
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 5b1eaef72f4..4f9eff96b84 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -2,172 +2,171 @@
 <openerp>
     <data>
 
-<!--        <menuitem name="Survey Management" id="main_menu_survey" icon="terp-crm" sequence="1" groups="group_survey_manager,group_survey_user"/>-->
-		    <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
-			<menuitem name="Define Surveys" id="menu_define_survey"
-				 groups="group_survey_manager"
-				 parent="base.menu_tools" />
-			<menuitem id="menu_answer_surveys" name="Answer Surveys" parent="base.menu_tools" groups="group_survey_manager,group_survey_user"/>
-<!--        <menuitem name="Configuration" id="menu_survey_config" parent="main_menu_survey" groups="group_survey_manager"/>-->
-			<menuitem name="Reporting" parent="base.menu_tools"
-				id="menu_reporting" groups="group_survey_manager"/>
+            <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
+            <menuitem name="Define Surveys" id="menu_define_survey"
+                 groups="group_survey_manager"
+                 parent="base.menu_tools" />
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="base.menu_tools" groups="group_survey_manager,group_survey_user"/>
+            <menuitem name="Reporting" parent="base.menu_tools"
+                id="menu_reporting" groups="group_survey_manager"/>
         <!--
             Survey
         -->
+
         <record model="ir.ui.view" id="survey_form">
             <field name="name">survey_form</field>
             <field name="model">survey</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey">
-                	<field name="title" select="1"/>
-                	<group col="6" colspan="6">
-	                    <field name="responsible_id"/>
-	                	<button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-	                    	string="Test Survey" type="action" icon="gtk-new"
-	                    	context="{'active':True,'survey_id': active_id}"/>
-						<button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-	                        string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-						<button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-	                        string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
-					</group>
+                    <field name="title" select="1"/>
+                    <group col="6" colspan="6">
+                        <field name="responsible_id"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                            string="Test Survey" type="action" icon="gtk-new"
+                            context="{'active':True,'survey_id': active_id}"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                            string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                            string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="form,tree" context="{'line_order': page_ids}">
                                 <form string="Survey Page">
                                     <field name="title" select="1"/>
-                                    <field name="sequence"/>
+                                    <field name="sequence" groups="base.group_extended"/>
                                     <field name="note" colspan="4" nolabel="1"/>
                                     <field name="question_ids" colspan="4" nolabel="1" context="{'line_order': question_ids}">
                                         <form string="Survey Question">
                                             <field name="question" colspan="4" select="1"/>
                                             <field name="sequence"/>
-                                            <field name="tot_resp" select="2"/>
+                                            <field name="tot_resp"/>
                                             <field name="type" on_change="on_change_type(type)"/>
-						                    <field name="in_visible_rating_weight" invisible="1"/>
-						                    <field name="in_visible_menu_choice" invisible="1"/>
-						                    <field name="in_visible_answer_type" invisible="1"/>
-						                    <notebook colspan="4">
-						                        <page string="Options">
-													<group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-							                          <separator string="Answer" colspan="4"/>
-													   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-								                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
-								                       </group>
-								                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-								                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-															<group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-															   <field name="no_of_rows"/>
-															</group>
-								                       </group>
-							                        </group>
-							                        <newline/>
-													<group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-							                            <separator string="Comment Field" colspan="4"/>
-							                            <group colspan="4">
-															<field name="is_comment_require"/>
-														</group>
-							                            <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-								                            <group col="4" colspan="4">
-									                            <field name="comment_field_type" colspan="1"/>
-									                            <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-									                                <field colspan="2" name="comment_label" />
-									                            </group>
-															</group>
-								                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-								                                <field name="comment_valid_type" colspan="2"/>
-								                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-								                                    <field name="comment_minimum_no" string="Between"/>
-								                                    <field name="comment_maximum_no" string="and"/>
-								                                </group>
-								                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-								                                    <field name="comment_minimum_float" string="Between"/>
-								                                    <field name="comment_maximum_float" string="and"/>
-								                                </group>
-								                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-								                                    <field name="comment_minimum_date" string="Between"/>
-								                                    <field name="comment_maximum_date" string="and"/>
-								                                </group>
-								                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-								                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-								                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
-								                                </group>
-								                            </group>
-														</group>
-							                        </group>
-													<newline/>
-						                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-							                            <field name="comment_column"/>
-							                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-							                                <field name="column_name" colspan="2"/>
-							                            </group>
-													</group>
-							                        <newline/>
-							                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-							                            <separator string="Validation" colspan="4"/>
-							                            <group colspan="4">
-															<field name="is_validation_require"/>
-														</group>
-							                            <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-							                                <field name="validation_type" colspan="2"/>
-							                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-							                                    <field name="validation_minimum_no" string="Between"/>
-							                                    <field name="validation_maximum_no" string="and"/>
-							                                </group>
-							                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-							                                    <field name="validation_minimum_float" string="Between"/>
-							                                    <field name="validation_maximum_float" string="and"/>
-							                                </group>
-							                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-							                                    <field name="validation_minimum_date" string="Between"/>
-							                                    <field name="validation_maximum_date" string="and"/>
-							                                </group>
-							                            </group>
-							                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-							                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-							                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-							                            </group>
-							                        </group>
-							                        <newline/>
-							                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-							                            <separator string="Required Answer" colspan="4"/>
-							                            <newline/>
-						                                <field name="is_require_answer"/>
-														<group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-								                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-								                                <field name="required_type"/>
-								                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-								                                    <field name="req_ans" />
-								                                </group>
-								                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-								                                    <field name="minimum_req_ans"/>
-								                                    <field name="maximum_req_ans"/>
-								                                </group>
-								                            </group>
-								                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-								                                <label string="When the question is not answered, display this error message:"/>
-								                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-								                            </group>
-								                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-								                                <group colspan="2" >
-								                                    <field name="numeric_required_sum"/>
-								                                </group>
-								                                <newline/>
-								                                <label string="When the choices do not add up correctly, display this error message"/>
-								                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-								                            </group>
-								                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-								                                <field name="rating_allow_one_column_require"/>
-								                            </group>
-														</group>
-							                        </group>
-							                        <newline/>
-							                        <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-							                            <separator string="Descriptive Text" colspan="4"/>
-							                            <field name="descriptive_text" colspan="4" nolabel="1"/>
-							                        </group>
-						                        </page>
-						                    </notebook>
+                                            <field name="in_visible_rating_weight" invisible="1"/>
+                                            <field name="in_visible_menu_choice" invisible="1"/>
+                                            <field name="in_visible_answer_type" invisible="1"/>
+                                            <notebook colspan="4">
+                                                <page string="Options">
+                                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+                                                      <separator string="Answer" colspan="4"/>
+                                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                                       </group>
+                                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                                               <field name="no_of_rows"/>
+                                                            </group>
+                                                       </group>
+                                                    </group>
+                                                    <newline/>
+                                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                                        <separator string="Comment Field" colspan="4"/>
+                                                        <group colspan="4">
+                                                            <field name="is_comment_require"/>
+                                                        </group>
+                                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                            <group col="4" colspan="4">
+                                                                <field name="comment_field_type" colspan="1"/>
+                                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                    <field colspan="2" name="comment_label" />
+                                                                </group>
+                                                            </group>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                <field name="comment_valid_type" colspan="2"/>
+                                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                                    <field name="comment_minimum_no" string="Between"/>
+                                                                    <field name="comment_maximum_no" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                                    <field name="comment_minimum_float" string="Between"/>
+                                                                    <field name="comment_maximum_float" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                                    <field name="comment_minimum_date" string="Between"/>
+                                                                    <field name="comment_maximum_date" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                                </group>
+                                                            </group>
+                                                        </group>
+                                                    </group>
+                                                    <newline/>
+                                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                        <field name="comment_column"/>
+                                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                            <field name="column_name" colspan="2"/>
+                                                        </group>
+                                                    </group>
+                                                    <newline/>
+                                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                        <separator string="Validation" colspan="4"/>
+                                                        <group colspan="4">
+                                                            <field name="is_validation_require"/>
+                                                        </group>
+                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                            <field name="validation_type" colspan="2"/>
+                                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                                <field name="validation_minimum_no" string="Between"/>
+                                                                <field name="validation_maximum_no" string="and"/>
+                                                            </group>
+                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                                <field name="validation_minimum_float" string="Between"/>
+                                                                <field name="validation_maximum_float" string="and"/>
+                                                            </group>
+                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                                <field name="validation_minimum_date" string="Between"/>
+                                                                <field name="validation_maximum_date" string="and"/>
+                                                            </group>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                                        </group>
+                                                    </group>
+                                                    <newline/>
+                                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                        <separator string="Required Answer" colspan="4"/>
+                                                        <newline/>
+                                                        <field name="is_require_answer"/>
+                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                                <field name="required_type"/>
+                                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                                    <field name="req_ans" />
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                                    <field name="minimum_req_ans"/>
+                                                                    <field name="maximum_req_ans"/>
+                                                                </group>
+                                                            </group>
+                                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                                <label string="When the question is not answered, display this error message:"/>
+                                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                            </group>
+                                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                                <group colspan="2" >
+                                                                    <field name="numeric_required_sum"/>
+                                                                </group>
+                                                                <newline/>
+                                                                <label string="When the choices do not add up correctly, display this error message"/>
+                                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                            </group>
+                                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                                <field name="rating_allow_one_column_require"/>
+                                                            </group>
+                                                        </group>
+                                                    </group>
+                                                    <newline/>
+                                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                        <separator string="Descriptive Text" colspan="4"/>
+                                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                </page>
+                                            </notebook>
                                         </form>
                                         <tree string="Survey Question">
                                             <field name="sequence" string="Seq"/>
@@ -191,20 +190,20 @@
                             </group>
                         </page>
                         <page string="Other">
-                        	<group colspan="6" col='4'>
-	                            <field name="max_response_limit" select="1"
-	                                attrs="{'readonly':[('state','in',('open','close'))]}"/>
-	                            <field name="response_user" select="2"
-	                                attrs="{'readonly':[('state','in',('open','close'))]}"/>
-								<field name="type"/>
-	                            <field name="send_response"/>
-							</group>
+                            <group colspan="6" col='4'>
+                                <field name="max_response_limit" select="1"
+                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                                <field name="response_user"
+                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                                <field name="type"/>
+                                <field name="send_response"/>
+                            </group>
                             <separator colspan="4" string="Survey Details"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
                         <page string="History">
                             <field name="date_open" select="1"/>
-                            <field name="date_close" select="2"/>
+                            <field name="date_close"/>
                             <field name="tot_start_survey" select="1"/>
                             <field name="tot_comp_survey" select="1"/>
                             <field name="history" colspan="4" nolabel="1">
@@ -232,19 +231,19 @@
                     <field name="title" select="1"/>
                     <field name="type" select="1"/>
                     <field name="date_open" select="1" string="Open Date"/>
-					<field name="responsible_id" select="2"/>
-                    <field name="tot_start_survey" select="2" string="Started"/>
-                    <field name="tot_comp_survey" select="2" string="Completed"/>
+                    <field name="responsible_id"/>
+                    <field name="tot_start_survey" string="Started"/>
+                    <field name="tot_comp_survey" string="Completed"/>
                     <field name="state" select="1"/>
-                	<button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                    	string="Test Survey" type="action" icon="gtk-new"
-                    	context="{'active':True,'survey_id': active_id}"/>
-					<button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                        string="Test Survey" type="action" icon="gtk-new"
+                        context="{'active':True,'survey_id': active_id}"/>
+                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                         string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-					<button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                         string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
-					<button name="action_print_survey" states="open,draft,close,cancel"
-                                	string="Print Answer" type="object" icon="gtk-print"/>
+                    <button name="action_print_survey" states="open,draft,close,cancel"
+                                    string="Print Answer" type="object" icon="gtk-print"/>
                 </tree>
             </field>
         </record>
@@ -302,132 +301,132 @@
                     <form string="Survey Question">
                         <field name="question" colspan="4" select="1"/>
                         <field name="sequence"/>
-                        <field name="tot_resp" select="2"/>
+                        <field name="tot_resp"/>
                         <field name="type" on_change="on_change_type(type)"/>
-	                    <field name="in_visible_rating_weight" invisible="1"/>
-	                    <field name="in_visible_menu_choice" invisible="1"/>
-	                    <field name="in_visible_answer_type" invisible="1"/>
+                        <field name="in_visible_rating_weight" invisible="1"/>
+                        <field name="in_visible_menu_choice" invisible="1"/>
+                        <field name="in_visible_answer_type" invisible="1"/>
                         <notebook colspan="4">
-	                        <page string="Options">
-								<group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-		                          <separator string="Answer" colspan="4"/>
-								   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-			                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
-			                       </group>
-			                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-			                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-										<group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-										   <field name="no_of_rows"/>
-										</group>
-			                       </group>
-		                        </group>
-		                        <newline/>
-								<group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-		                            <separator string="Comment Field" colspan="4"/>
-		                            <group colspan="4">
-										<field name="is_comment_require"/>
-									</group>
-		                            <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-			                            <group col="4" colspan="4">
-				                            <field name="comment_field_type" colspan="1"/>
-				                            <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-				                                <field colspan="2" name="comment_label" />
-				                            </group>
-										</group>
-			                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-			                                <field name="comment_valid_type" colspan="2"/>
-			                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-			                                    <field name="comment_minimum_no" string="Between"/>
-			                                    <field name="comment_maximum_no" string="and"/>
-			                                </group>
-			                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-			                                    <field name="comment_minimum_float" string="Between"/>
-			                                    <field name="comment_maximum_float" string="and"/>
-			                                </group>
-			                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-			                                    <field name="comment_minimum_date" string="Between"/>
-			                                    <field name="comment_maximum_date" string="and"/>
-			                                </group>
-			                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-			                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-			                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
-			                                </group>
-			                            </group>
-									</group>
-		                        </group>
-		                        <newline/>
-	                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-		                            <field name="comment_column"/>
-		                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-		                                <field name="column_name" colspan="2"/>
-		                            </group>
-								</group>
-		                        <newline/>
-		                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-		                            <separator string="Validation" colspan="4"/>
-		                            <group colspan="4">
-										<field name="is_validation_require"/>
-									</group>
-		                            <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-		                                <field name="validation_type" colspan="2"/>
-		                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-		                                    <field name="validation_minimum_no" string="Between"/>
-		                                    <field name="validation_maximum_no" string="and"/>
-		                                </group>
-		                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-		                                    <field name="validation_minimum_float" string="Between"/>
-		                                    <field name="validation_maximum_float" string="and"/>
-		                                </group>
-		                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-		                                    <field name="validation_minimum_date" string="Between"/>
-		                                    <field name="validation_maximum_date" string="and"/>
-		                                </group>
-		                            </group>
-		                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-		                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-		                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-		                            </group>
-		                        </group>
-		                        <newline/>
-		                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-		                            <separator string="Required Answer" colspan="4"/>
-		                            <newline/>
-	                                <field name="is_require_answer"/>
-									<group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-			                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-			                                <field name="required_type"/>
-			                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-			                                    <field name="req_ans" />
-			                                </group>
-			                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-			                                    <field name="minimum_req_ans"/>
-			                                    <field name="maximum_req_ans"/>
-			                                </group>
-			                            </group>
-			                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-			                                <label string="When the question is not answered, display this error message:"/>
-			                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-			                            </group>
-			                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-			                                <group colspan="2" >
-			                                    <field name="numeric_required_sum"/>
-			                                </group>
-			                                <newline/>
-			                                <label string="When the choices do not add up correctly, display this error message"/>
-			                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-			                            </group>
-			                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-			                                <field name="rating_allow_one_column_require"/>
-			                            </group>
-									</group>
-		                        </group>
-		                        <newline/>
-		                        <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-		                            <separator string="Descriptive Text" colspan="4"/>
-		                            <field name="descriptive_text" colspan="4" nolabel="1"/>
-		                        </group>
-	                        </page>
-	                    </notebook>
+                            <page string="Options">
+                                <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+                                  <separator string="Answer" colspan="4"/>
+                                   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                       <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                   </group>
+                                   <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                       <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                        <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                           <field name="no_of_rows"/>
+                                        </group>
+                                   </group>
+                                </group>
+                                <newline/>
+                                <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                    <separator string="Comment Field" colspan="4"/>
+                                    <group colspan="4">
+                                        <field name="is_comment_require"/>
+                                    </group>
+                                    <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                        <group col="4" colspan="4">
+                                            <field name="comment_field_type" colspan="1"/>
+                                            <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                <field colspan="2" name="comment_label" />
+                                            </group>
+                                        </group>
+                                        <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                            <field name="comment_valid_type" colspan="2"/>
+                                            <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                <field name="comment_minimum_no" string="Between"/>
+                                                <field name="comment_maximum_no" string="and"/>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                <field name="comment_minimum_float" string="Between"/>
+                                                <field name="comment_maximum_float" string="and"/>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                <field name="comment_minimum_date" string="Between"/>
+                                                <field name="comment_maximum_date" string="and"/>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                            </group>
+                                        </group>
+                                    </group>
+                                </group>
+                                <newline/>
+                                <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                    <field name="comment_column"/>
+                                    <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                        <field name="column_name" colspan="2"/>
+                                    </group>
+                                </group>
+                                <newline/>
+                                <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                    <separator string="Validation" colspan="4"/>
+                                    <group colspan="4">
+                                        <field name="is_validation_require"/>
+                                    </group>
+                                    <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                        <field name="validation_type" colspan="2"/>
+                                        <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                            <field name="validation_minimum_no" string="Between"/>
+                                            <field name="validation_maximum_no" string="and"/>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                            <field name="validation_minimum_float" string="Between"/>
+                                            <field name="validation_maximum_float" string="and"/>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                            <field name="validation_minimum_date" string="Between"/>
+                                            <field name="validation_maximum_date" string="and"/>
+                                        </group>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                        <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                        <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                    </group>
+                                </group>
+                                <newline/>
+                                <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                    <separator string="Required Answer" colspan="4"/>
+                                    <newline/>
+                                    <field name="is_require_answer"/>
+                                    <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                        <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                            <field name="required_type"/>
+                                            <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                <field name="req_ans" />
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                <field name="minimum_req_ans"/>
+                                                <field name="maximum_req_ans"/>
+                                            </group>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                            <label string="When the question is not answered, display this error message:"/>
+                                            <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                            <group colspan="2" >
+                                                <field name="numeric_required_sum"/>
+                                            </group>
+                                            <newline/>
+                                            <label string="When the choices do not add up correctly, display this error message"/>
+                                            <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                            <field name="rating_allow_one_column_require"/>
+                                        </group>
+                                    </group>
+                                </group>
+                                <newline/>
+                                <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                    <separator string="Descriptive Text" colspan="4"/>
+                                    <field name="descriptive_text" colspan="4" nolabel="1"/>
+                                </group>
+                            </page>
+                        </notebook>
 
                     </form>
                     <tree string="Survey Question">
@@ -477,13 +476,13 @@
                     <field name="sequence"/>
                     <separator string="Description" colspan="4"/>
                     <field name="note" colspan="4" nolabel="1"/>
-                  	<group colspan="4">
-                  		<label string="" colspan="3"/>
-						<button name="survey_save"  string="Ok" type="object" icon="gtk-go-back"/>
-					</group>
-				</form>
-			</field>
-		</record>
+                      <group colspan="4">
+                          <label string="" colspan="3"/>
+                        <button name="survey_save"  string="Ok" type="object" icon="gtk-go-back"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
         <!--
             Survey Question
@@ -505,123 +504,123 @@
                     <field name="in_visible_answer_type" invisible="1"/>
                     <notebook colspan="4">
                         <page string="Options">
-							<group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-	                          <separator string="Answer" colspan="4"/>
-							   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-		                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
-		                       </group>
-		                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-		                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-									<group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-									   <field name="no_of_rows"/>
-									</group>
-		                       </group>
-	                        </group>
-	                        <newline/>
-							<group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-	                            <separator string="Comment Field" colspan="4"/>
-	                            <group colspan="4">
-									<field name="is_comment_require"/>
-								</group>
-	                            <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-		                            <group col="4" colspan="4">
-			                            <field name="comment_field_type" colspan="1"/>
-			                            <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-			                                <field colspan="2" name="comment_label" />
-			                            </group>
-									</group>
-		                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-		                                <field name="comment_valid_type" colspan="2"/>
-		                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-		                                    <field name="comment_minimum_no" string="Between"/>
-		                                    <field name="comment_maximum_no" string="and"/>
-		                                </group>
-		                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-		                                    <field name="comment_minimum_float" string="Between"/>
-		                                    <field name="comment_maximum_float" string="and"/>
-		                                </group>
-		                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-		                                    <field name="comment_minimum_date" string="Between"/>
-		                                    <field name="comment_maximum_date" string="and"/>
-		                                </group>
-		                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-		                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-		                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
-		                                </group>
-		                            </group>
-								</group>
-	                        </group>
-	                        <newline/>
+                            <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+                              <separator string="Answer" colspan="4"/>
+                               <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                   <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
+                               </group>
+                               <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                   <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                    <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                       <field name="no_of_rows"/>
+                                    </group>
+                               </group>
+                            </group>
+                            <newline/>
+                            <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                <separator string="Comment Field" colspan="4"/>
+                                <group colspan="4">
+                                    <field name="is_comment_require"/>
+                                </group>
+                                <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                    <group col="4" colspan="4">
+                                        <field name="comment_field_type" colspan="1"/>
+                                        <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                            <field colspan="2" name="comment_label" />
+                                        </group>
+                                    </group>
+                                    <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                        <field name="comment_valid_type" colspan="2"/>
+                                        <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                            <field name="comment_minimum_no" string="Between"/>
+                                            <field name="comment_maximum_no" string="and"/>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                            <field name="comment_minimum_float" string="Between"/>
+                                            <field name="comment_maximum_float" string="and"/>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                            <field name="comment_minimum_date" string="Between"/>
+                                            <field name="comment_maximum_date" string="and"/>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                            <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                        </group>
+                                    </group>
+                                </group>
+                            </group>
+                            <newline/>
                             <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-	                            <field name="comment_column"/>
-	                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-	                                <field name="column_name" colspan="2"/>
-	                            </group>
-							</group>
-	                        <newline/>
-	                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-	                            <separator string="Validation" colspan="4"/>
-	                            <group colspan="4">
-									<field name="is_validation_require"/>
-								</group>
-	                            <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-	                                <field name="validation_type" colspan="2"/>
-	                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-	                                    <field name="validation_minimum_no" string="Between"/>
-	                                    <field name="validation_maximum_no" string="and"/>
-	                                </group>
-	                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-	                                    <field name="validation_minimum_float" string="Between"/>
-	                                    <field name="validation_maximum_float" string="and"/>
-	                                </group>
-	                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-	                                    <field name="validation_minimum_date" string="Between"/>
-	                                    <field name="validation_maximum_date" string="and"/>
-	                                </group>
-	                            </group>
-	                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-	                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-	                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-	                            </group>
-	                        </group>
-	                        <newline/>
-	                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-	                            <separator string="Required Answer" colspan="4"/>
-	                            <newline/>
+                                <field name="comment_column"/>
+                                <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                    <field name="column_name" colspan="2"/>
+                                </group>
+                            </group>
+                            <newline/>
+                            <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                <separator string="Validation" colspan="4"/>
+                                <group colspan="4">
+                                    <field name="is_validation_require"/>
+                                </group>
+                                <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                    <field name="validation_type" colspan="2"/>
+                                    <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                        <field name="validation_minimum_no" string="Between"/>
+                                        <field name="validation_maximum_no" string="and"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                        <field name="validation_minimum_float" string="Between"/>
+                                        <field name="validation_maximum_float" string="and"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                        <field name="validation_minimum_date" string="Between"/>
+                                        <field name="validation_maximum_date" string="and"/>
+                                    </group>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                    <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                </group>
+                            </group>
+                            <newline/>
+                            <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                <separator string="Required Answer" colspan="4"/>
+                                <newline/>
                                 <field name="is_require_answer"/>
-								<group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-		                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-		                                <field name="required_type"/>
-		                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-		                                    <field name="req_ans" />
-		                                </group>
-		                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-		                                    <field name="minimum_req_ans"/>
-		                                    <field name="maximum_req_ans"/>
-		                                </group>
-		                            </group>
-		                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-		                                <label string="When the question is not answered, display this error message:"/>
-		                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-		                            </group>
-		                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-		                                <group colspan="2" >
-		                                    <field name="numeric_required_sum"/>
-		                                </group>
-		                                <newline/>
-		                                <label string="When the choices do not add up correctly, display this error message"/>
-		                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-		                            </group>
-		                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-		                                <field name="rating_allow_one_column_require"/>
-		                            </group>
-								</group>
-	                        </group>
-	                        <newline/>
-	                        <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-	                            <separator string="Descriptive Text" colspan="4"/>
-	                            <field name="descriptive_text" colspan="4" nolabel="1"/>
-	                        </group>
+                                <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                    <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                        <field name="required_type"/>
+                                        <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                            <field name="req_ans" />
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                            <field name="minimum_req_ans"/>
+                                            <field name="maximum_req_ans"/>
+                                        </group>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                        <label string="When the question is not answered, display this error message:"/>
+                                        <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                        <group colspan="2" >
+                                            <field name="numeric_required_sum"/>
+                                        </group>
+                                        <newline/>
+                                        <label string="When the choices do not add up correctly, display this error message"/>
+                                        <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                        <field name="rating_allow_one_column_require"/>
+                                    </group>
+                                </group>
+                            </group>
+                            <newline/>
+                            <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                <separator string="Descriptive Text" colspan="4"/>
+                                <field name="descriptive_text" colspan="4" nolabel="1"/>
+                            </group>
                         </page>
                     </notebook>
                 </form>
@@ -634,7 +633,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Survey Question">
-					<field name="sequence" string="Seq"/>
+                    <field name="sequence" string="Seq"/>
                     <field name="question"/>
                     <field name="page_id"/>
                     <field name="survey"/>
@@ -685,129 +684,129 @@
                     <field name="in_visible_answer_type" invisible="1"/>
                     <notebook colspan="4">
                         <page string="Options">
-							<group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-	                          <separator string="Answer" colspan="4"/>
-							   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-		                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
-		                       </group>
-		                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-		                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-									<group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-									   <field name="no_of_rows"/>
-									</group>
-		                       </group>
-	                        </group>
-	                        <newline/>
-							<group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-	                            <separator string="Comment Field" colspan="4"/>
-	                            <group colspan="4">
-									<field name="is_comment_require"/>
-								</group>
-	                            <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-		                            <group col="4" colspan="4">
-			                            <field name="comment_field_type" colspan="1"/>
-			                            <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-			                                <field colspan="2" name="comment_label" />
-			                            </group>
-									</group>
-		                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-		                                <field name="comment_valid_type" colspan="2"/>
-		                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-		                                    <field name="comment_minimum_no" string="Between"/>
-		                                    <field name="comment_maximum_no" string="and"/>
-		                                </group>
-		                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-		                                    <field name="comment_minimum_float" string="Between"/>
-		                                    <field name="comment_maximum_float" string="and"/>
-		                                </group>
-		                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-		                                    <field name="comment_minimum_date" string="Between"/>
-		                                    <field name="comment_maximum_date" string="and"/>
-		                                </group>
-		                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-		                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-		                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
-		                                </group>
-		                            </group>
-								</group>
-	                        </group>
-	                        <newline/>
+                            <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+                              <separator string="Answer" colspan="4"/>
+                               <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                   <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
+                               </group>
+                               <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                   <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                    <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                       <field name="no_of_rows"/>
+                                    </group>
+                               </group>
+                            </group>
+                            <newline/>
+                            <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                <separator string="Comment Field" colspan="4"/>
+                                <group colspan="4">
+                                    <field name="is_comment_require"/>
+                                </group>
+                                <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                    <group col="4" colspan="4">
+                                        <field name="comment_field_type" colspan="1"/>
+                                        <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                            <field colspan="2" name="comment_label" />
+                                        </group>
+                                    </group>
+                                    <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                        <field name="comment_valid_type" colspan="2"/>
+                                        <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                            <field name="comment_minimum_no" string="Between"/>
+                                            <field name="comment_maximum_no" string="and"/>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                            <field name="comment_minimum_float" string="Between"/>
+                                            <field name="comment_maximum_float" string="and"/>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                            <field name="comment_minimum_date" string="Between"/>
+                                            <field name="comment_maximum_date" string="and"/>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                            <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                        </group>
+                                    </group>
+                                </group>
+                            </group>
+                            <newline/>
                             <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-	                            <field name="comment_column"/>
-	                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-	                                <field name="column_name" colspan="2"/>
-	                            </group>
-							</group>
-	                        <newline/>
-	                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-	                            <separator string="Validation" colspan="4"/>
-	                            <group colspan="4">
-									<field name="is_validation_require"/>
-								</group>
-	                            <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-	                                <field name="validation_type" colspan="2"/>
-	                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-	                                    <field name="validation_minimum_no" string="Between"/>
-	                                    <field name="validation_maximum_no" string="and"/>
-	                                </group>
-	                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-	                                    <field name="validation_minimum_float" string="Between"/>
-	                                    <field name="validation_maximum_float" string="and"/>
-	                                </group>
-	                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-	                                    <field name="validation_minimum_date" string="Between"/>
-	                                    <field name="validation_maximum_date" string="and"/>
-	                                </group>
-	                            </group>
-	                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-	                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-	                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-	                            </group>
-	                        </group>
-	                        <newline/>
-	                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-	                            <separator string="Required Answer" colspan="4"/>
-	                            <newline/>
+                                <field name="comment_column"/>
+                                <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                    <field name="column_name" colspan="2"/>
+                                </group>
+                            </group>
+                            <newline/>
+                            <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                <separator string="Validation" colspan="4"/>
+                                <group colspan="4">
+                                    <field name="is_validation_require"/>
+                                </group>
+                                <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                    <field name="validation_type" colspan="2"/>
+                                    <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                        <field name="validation_minimum_no" string="Between"/>
+                                        <field name="validation_maximum_no" string="and"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                        <field name="validation_minimum_float" string="Between"/>
+                                        <field name="validation_maximum_float" string="and"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                        <field name="validation_minimum_date" string="Between"/>
+                                        <field name="validation_maximum_date" string="and"/>
+                                    </group>
+                                </group>
+                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                    <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                </group>
+                            </group>
+                            <newline/>
+                            <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                <separator string="Required Answer" colspan="4"/>
+                                <newline/>
                                 <field name="is_require_answer"/>
-								<group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-		                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-		                                <field name="required_type"/>
-		                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-		                                    <field name="req_ans" />
-		                                </group>
-		                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-		                                    <field name="minimum_req_ans"/>
-		                                    <field name="maximum_req_ans"/>
-		                                </group>
-		                            </group>
-		                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-		                                <label string="When the question is not answered, display this error message:"/>
-		                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-		                            </group>
-		                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-		                                <group colspan="2" >
-		                                    <field name="numeric_required_sum"/>
-		                                </group>
-		                                <newline/>
-		                                <label string="When the choices do not add up correctly, display this error message"/>
-		                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-		                            </group>
-		                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-		                                <field name="rating_allow_one_column_require"/>
-		                            </group>
-								</group>
-	                        </group>
-	                        <newline/>
-	                        <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-	                            <separator string="Descriptive Text" colspan="4"/>
-	                            <field name="descriptive_text" colspan="4" nolabel="1"/>
-	                        </group>
+                                <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                    <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                        <field name="required_type"/>
+                                        <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                            <field name="req_ans" />
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                            <field name="minimum_req_ans"/>
+                                            <field name="maximum_req_ans"/>
+                                        </group>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                        <label string="When the question is not answered, display this error message:"/>
+                                        <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                        <group colspan="2" >
+                                            <field name="numeric_required_sum"/>
+                                        </group>
+                                        <newline/>
+                                        <label string="When the choices do not add up correctly, display this error message"/>
+                                        <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                    </group>
+                                    <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                        <field name="rating_allow_one_column_require"/>
+                                    </group>
+                                </group>
+                            </group>
+                            <newline/>
+                            <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                <separator string="Descriptive Text" colspan="4"/>
+                                <field name="descriptive_text" colspan="4" nolabel="1"/>
+                            </group>
                         </page>
                     </notebook>
-                  	<group colspan="4">
-                  		<label string="" colspan="3"/>
-						<button name="survey_save"  string="Ok" type="object" icon="gtk-ok"/>
-					</group>
+                      <group colspan="4">
+                          <label string="" colspan="3"/>
+                        <button name="survey_save"  string="Ok" type="object" icon="gtk-ok"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -825,11 +824,11 @@
                     <field name="answer" colspan="4" select="1"/>
                     <field name="sequence"/>
                     <field name="in_visible_answer_type" invisible="1"/>
-                   	<group colspan="4" attrs="{'invisible':[('in_visible_answer_type','=',True)]}">
+                       <group colspan="4" attrs="{'invisible':[('in_visible_answer_type','=',True)]}">
                         <field name="type" colspan="2"/>
                         <group colspan="4" attrs="{'invisible':[('type','!=','selection')]}">
-                        	<separator string="Menu Choices (each choice on separate by lines)" colspan="4"/>
-                        	<field name="menu_choice" colspan="4" nolabel="1"/>
+                            <separator string="Menu Choices (each choice on separate by lines)" colspan="4"/>
+                            <field name="menu_choice" colspan="4" nolabel="1"/>
                         </group>
                     </group>
                 </form>
@@ -859,7 +858,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Answer">
-                	<field name="question_id"/>
+                    <field name="question_id"/>
                     <field name="date_create" select="1"/>
                     <notebook colspan="4">
                         <page string="Answer">
@@ -878,14 +877,14 @@
                         <page string="Table Answer">
                             <field name="response_table_ids" colspan="4" nolabel="1">
                             <form string="Table">
-                            	<field name="column_id"/>
-                            	<field name="name"/>
-                            	<field name="value"/>
+                                <field name="column_id"/>
+                                <field name="name"/>
+                                <field name="value"/>
                             </form>
                             <tree string="Table">
-                            	<field name="column_id"/>
-                            	<field name="name"/>
-                            	<field name="value"/>
+                                <field name="column_id"/>
+                                <field name="name"/>
+                                <field name="value"/>
                             </tree>
                             </field>
                         </page>
@@ -900,7 +899,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Survey Answer Line">
-                	<field name="page_id"/>
+                    <field name="page_id"/>
                     <field name="question_id"/>
                     <field name="date_create" select="1"/>
                     <field name="state"/>
@@ -918,7 +917,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Answer">
-					<field name="survey_id" select="1"/>
+                    <field name="survey_id" select="1"/>
                     <field name="date_create" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="response_type" select="1"/>
@@ -934,7 +933,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Survey Answer">
-                	<field name="survey_id" select="1"/>
+                    <field name="survey_id" select="1"/>
                     <field name="date_create" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="response_type" select="1"/>
@@ -960,9 +959,9 @@
                     <field name="value_choice"/>
                     <label string="(Use Only Question Type is matrix_of_drop_down_menus)" align="0.0"/>
                     <group colspan="4" col="4">
-	                    <field name="comment_field"/>
-	                    <field name="column_id"/>
-	                </group>
+                        <field name="comment_field"/>
+                        <field name="column_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -1027,15 +1026,15 @@
             <field name="model">survey.request</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Survey Request">
+                <form string="Survey Request">
                     <field name="date_deadline"/>
                     <field name="survey_id"/>
                     <field name="user_id" on_change="on_change_user(user_id)"/>
 <!--                    <field name="email"/>-->
-     				<field name="response" readonly="1"/>
+                     <field name="response" readonly="1"/>
                     <group colspan="4" col="6">
                      <field name="state"/>
-                     	<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
+                         <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
                         <button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
                         <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
                         <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
@@ -1051,7 +1050,7 @@
             <field name="arch" type="xml">
                 <tree string="Evaluation Plan Phase">
                     <field name="date_deadline"/>
-					<field name="user_id"/>
+                    <field name="user_id"/>
                     <field name="survey_id"/>
                     <field name="response" />
                     <field name="state" />
@@ -1163,9 +1162,9 @@
             res_model="survey.response"
             src_model="survey"/>
 
-		<menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
-			action="action_view_survey_name" parent="menu_answer_surveys"
-			groups="group_survey_manager,group_survey_user" icon="STOCK_INDEX"/>
+        <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
+            action="action_view_survey_name" parent="menu_answer_surveys"
+            groups="group_survey_manager,group_survey_user" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 2bc48cf339d..b5f88f20432 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -588,14 +588,15 @@ class survey_question_wiz(osv.osv_memory):
                     self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
                 else:
                     self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
-
-        for key,val in sur_name_read['store_ans'].items():
-            for field in vals:
-                if field.split('_')[0] == val['question_id']:
-                    click_state = False
-                    click_update.append(key)
-                    break
-
+        if sur_name_read['store_ans'] and type(sur_name_read['store_ans']) == dict:
+            for key,val in sur_name_read['store_ans'].items():
+                for field in vals:
+                    if field.split('_')[0] == val['question_id']:
+                        click_state = False
+                        click_update.append(key)
+                        break
+        else:
+            sur_name_read['store_ans'] = {}
         if click_state:
             que_li = []
             resp_id_list = []
diff --git a/addons/thunderbird/__terp__.py b/addons/thunderbird/__openerp__.py
similarity index 100%
rename from addons/thunderbird/__terp__.py
rename to addons/thunderbird/__openerp__.py
diff --git a/addons/thunderbird/i18n/bg.po b/addons/thunderbird/i18n/bg.po
index a59aabd1beb..fcc7758efa7 100644
--- a/addons/thunderbird/i18n/bg.po
+++ b/addons/thunderbird/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/cs.po b/addons/thunderbird/i18n/cs.po
index eb1074d839c..e9f2d5d8f3e 100644
--- a/addons/thunderbird/i18n/cs.po
+++ b/addons/thunderbird/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/de.po b/addons/thunderbird/i18n/de.po
index 856d454c6a9..9f1a0910b4d 100644
--- a/addons/thunderbird/i18n/de.po
+++ b/addons/thunderbird/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/fr.po b/addons/thunderbird/i18n/fr.po
index 39c8a736fcf..cfcae2d5c37 100644
--- a/addons/thunderbird/i18n/fr.po
+++ b/addons/thunderbird/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/hr.po b/addons/thunderbird/i18n/hr.po
index af3f235b175..e7accb0d6e0 100644
--- a/addons/thunderbird/i18n/hr.po
+++ b/addons/thunderbird/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/thunderbird/i18n/it.po b/addons/thunderbird/i18n/it.po
index 39e2e86b242..df7fe6511ed 100644
--- a/addons/thunderbird/i18n/it.po
+++ b/addons/thunderbird/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/sk.po b/addons/thunderbird/i18n/sk.po
index 7d1d794f3ca..047dcaba5f1 100644
--- a/addons/thunderbird/i18n/sk.po
+++ b/addons/thunderbird/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/sl.po b/addons/thunderbird/i18n/sl.po
index f702babce4c..4a60d1f4805 100644
--- a/addons/thunderbird/i18n/sl.po
+++ b/addons/thunderbird/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/zh_CN.po b/addons/thunderbird/i18n/zh_CN.po
index f22f95d6e52..f25ba3b39f7 100644
--- a/addons/thunderbird/i18n/zh_CN.po
+++ b/addons/thunderbird/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/users_ldap/__terp__.py b/addons/users_ldap/__openerp__.py
similarity index 100%
rename from addons/users_ldap/__terp__.py
rename to addons/users_ldap/__openerp__.py
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 976743287f3..b055ef2938d 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<record model="ir.ui.view" id="company_form_view">
-			<field name="name">res.company.form.inherit.users_ldap</field>
-			<field name="model">res.company</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_company_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page[@string='Configuration']" position="inside">                    
-					<field name="ldaps" nolabel="1" colspan="4">
-						<form string="LDAP Configuration">
+    <data>
+        <record model="ir.ui.view" id="company_form_view">
+            <field name="name">res.company.form.inherit.users_ldap</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='Configuration']" position="inside">                    
+                    <field name="ldaps" nolabel="1" colspan="4">
+                        <form string="LDAP Configuration">
                             <field name="ldap_server"/>
                             <field name="ldap_server_port"/>
-							<field name="ldap_binddn"/>
-							<field name="ldap_password"/>
-							<field name="ldap_base"/>
-							<field name="ldap_filter"/>
-							<field name="create_user"/>
+                            <field name="ldap_binddn"/>
+                            <field name="ldap_password"/>
+                            <field name="ldap_base"/>
+                            <field name="ldap_filter"/>
+                            <field name="create_user"/>
                             <field name="user"/>
                             <newline/>
                             <field name="sequence"/>
-						</form>
-						<tree string="LDAP Configuration">
-							<field name="sequence"/>
+                        </form>
+                        <tree string="LDAP Configuration">
+                            <field name="sequence"/>
                             <field name="ldap_server"/>
                             <field name="ldap_server_port"/>
-							<field name="ldap_base"/>
-						</tree>
-					</field>
-				</xpath>
-			</field>
-		</record>
-	</data>
+                            <field name="ldap_base"/>
+                        </tree>
+                    </field>
+                </xpath>
+            </field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/warning/__terp__.py b/addons/warning/__openerp__.py
similarity index 100%
rename from addons/warning/__terp__.py
rename to addons/warning/__openerp__.py
diff --git a/addons/warning/i18n/ar.po b/addons/warning/i18n/ar.po
index aaeeda4a56f..4e6f75078b5 100644
--- a/addons/warning/i18n/ar.po
+++ b/addons/warning/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/bg.po b/addons/warning/i18n/bg.po
index 5b2ca53e4ee..ddee8969831 100644
--- a/addons/warning/i18n/bg.po
+++ b/addons/warning/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/bs.po b/addons/warning/i18n/bs.po
index 68a5ab8fc09..86df22a31ca 100644
--- a/addons/warning/i18n/bs.po
+++ b/addons/warning/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/ca.po b/addons/warning/i18n/ca.po
index 905b09f0321..4c3fc8aad0d 100644
--- a/addons/warning/i18n/ca.po
+++ b/addons/warning/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/cs.po b/addons/warning/i18n/cs.po
index 09a97c9a7cc..34e86b47a7e 100644
--- a/addons/warning/i18n/cs.po
+++ b/addons/warning/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/de.po b/addons/warning/i18n/de.po
index 1fb19c7fb83..d7fa1ed92bb 100644
--- a/addons/warning/i18n/de.po
+++ b/addons/warning/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index 290d1af168c..f5e595aabbc 100644
--- a/addons/warning/i18n/es.po
+++ b/addons/warning/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/es_AR.po b/addons/warning/i18n/es_AR.po
index 06c2d7f1923..712794d0849 100644
--- a/addons/warning/i18n/es_AR.po
+++ b/addons/warning/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/et.po b/addons/warning/i18n/et.po
index a5249ba1711..d45b9a91980 100644
--- a/addons/warning/i18n/et.po
+++ b/addons/warning/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index 8e80f6f8e8a..681477bedfe 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index 50a0669e103..53602bfba7d 100644
--- a/addons/warning/i18n/hr.po
+++ b/addons/warning/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/warning/i18n/hu.po b/addons/warning/i18n/hu.po
index aaeeda4a56f..4e6f75078b5 100644
--- a/addons/warning/i18n/hu.po
+++ b/addons/warning/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/id.po b/addons/warning/i18n/id.po
index 3018ada01ad..ffff128743b 100644
--- a/addons/warning/i18n/id.po
+++ b/addons/warning/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/it.po b/addons/warning/i18n/it.po
index 984bf2639cb..a6010728f29 100644
--- a/addons/warning/i18n/it.po
+++ b/addons/warning/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/ko.po b/addons/warning/i18n/ko.po
index 8815c527027..e5a72254a07 100644
--- a/addons/warning/i18n/ko.po
+++ b/addons/warning/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/lt.po b/addons/warning/i18n/lt.po
index aaeeda4a56f..4e6f75078b5 100644
--- a/addons/warning/i18n/lt.po
+++ b/addons/warning/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/nl.po b/addons/warning/i18n/nl.po
index e54b9d0ab68..938f2ac746f 100644
--- a/addons/warning/i18n/nl.po
+++ b/addons/warning/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/nl_BE.po b/addons/warning/i18n/nl_BE.po
index 7d15284b815..a1c75f0c64d 100644
--- a/addons/warning/i18n/nl_BE.po
+++ b/addons/warning/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/pl.po b/addons/warning/i18n/pl.po
index 46b3ead4e05..7064e3fc2d1 100644
--- a/addons/warning/i18n/pl.po
+++ b/addons/warning/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/pt.po b/addons/warning/i18n/pt.po
index b832115b823..67c44d91796 100644
--- a/addons/warning/i18n/pt.po
+++ b/addons/warning/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/pt_BR.po b/addons/warning/i18n/pt_BR.po
index 09e887755ba..e76b7618e52 100644
--- a/addons/warning/i18n/pt_BR.po
+++ b/addons/warning/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/ro.po b/addons/warning/i18n/ro.po
index aaeeda4a56f..4e6f75078b5 100644
--- a/addons/warning/i18n/ro.po
+++ b/addons/warning/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po
index d8c6b0608a3..d5dfd76a583 100644
--- a/addons/warning/i18n/ru.po
+++ b/addons/warning/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/sl.po b/addons/warning/i18n/sl.po
index a414d705c1d..402b7c54573 100644
--- a/addons/warning/i18n/sl.po
+++ b/addons/warning/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/sr.po b/addons/warning/i18n/sr.po
index e7bf35ad8bb..e1214b7e8bc 100644
--- a/addons/warning/i18n/sr.po
+++ b/addons/warning/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/sv.po b/addons/warning/i18n/sv.po
index 7f73b49b5cc..200804c6197 100644
--- a/addons/warning/i18n/sv.po
+++ b/addons/warning/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/tlh.po b/addons/warning/i18n/tlh.po
index e35e59a1307..0ddfba94149 100644
--- a/addons/warning/i18n/tlh.po
+++ b/addons/warning/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 5d385489c5c..541604609db 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/uk.po b/addons/warning/i18n/uk.po
index e7ba8899457..040e9b2a7c4 100644
--- a/addons/warning/i18n/uk.po
+++ b/addons/warning/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/zh_CN.po b/addons/warning/i18n/zh_CN.po
index 345acfb6ddc..f53e297c137 100644
--- a/addons/warning/i18n/zh_CN.po
+++ b/addons/warning/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/zh_TW.po b/addons/warning/i18n/zh_TW.po
index 1ce105feb61..ce3785baaaa 100644
--- a/addons/warning/i18n/zh_TW.po
+++ b/addons/warning/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml
index 1fbe86e5c89..55a00b66776 100644
--- a/addons/warning/warning_view.xml
+++ b/addons/warning/warning_view.xml
@@ -10,31 +10,30 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Warnings">
-                    	<group colspan="2" col="2">
-	                        <separator string="Warning on the Sale Order" colspan="4"/>
-	                        	<field name="sale_warn" nolabel="1" />
-	                        	<field name="sale_warn_msg" colspan="3" nolabel="1" 
-	                        			attrs="{'required':[('sale_warn','!=','no-message')],'readonly':[('sale_warn','=','no-message')]}"/>
-						</group>
                         <group colspan="2" col="2">
-	                        <separator string="Warning on the Purchase Order" colspan="4"/>
-                        	<field name="purchase_warn" nolabel="1" />
-	                        <field name="purchase_warn_msg" colspan="3" nolabel="1" 
-	                        		attrs="{'required':[('purchase_warn','!=','no-message')],'readonly':[('purchase_warn','=','no-message')]}"/>
-                      	</group>
-                      	<group colspan="2" col="2">
-                        	<separator string="Warning on the Picking" colspan="4"/>
-                        	<field name="picking_warn" nolabel="1" />
-                        	<field name="picking_warn_msg" colspan="3" nolabel="1" 
-                        			attrs="{'required':[('picking_warn','!=','no-message')],'readonly':[('picking_warn','=','no-message')]}"/>
-						</group>
-						<group colspan="2" col="2">
-                        	<separator string="Warning on the Invoice" colspan="4"/>
-                        	<field name="invoice_warn" nolabel="1" />
-                        	<field name="invoice_warn_msg" colspan="3" nolabel="1" 
-                        			attrs="{'required':[('invoice_warn','!=','no-message')],'readonly':[('invoice_warn','=','no-message')]}"/>
-						</group>
-                        
+                            <separator string="Warning on the Sale Order" colspan="4"/>
+                                <field name="sale_warn" nolabel="1" />
+                                <field name="sale_warn_msg" colspan="3" nolabel="1" 
+                                        attrs="{'required':[('sale_warn','!=','no-message')],'readonly':[('sale_warn','=','no-message')]}"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Warning on the Purchase Order" colspan="4"/>
+                            <field name="purchase_warn" nolabel="1" />
+                            <field name="purchase_warn_msg" colspan="3" nolabel="1" 
+                                    attrs="{'required':[('purchase_warn','!=','no-message')],'readonly':[('purchase_warn','=','no-message')]}"/>
+                          </group>
+                          <group colspan="2" col="2">
+                            <separator string="Warning on the Picking" colspan="4"/>
+                            <field name="picking_warn" nolabel="1" />
+                            <field name="picking_warn_msg" colspan="3" nolabel="1" 
+                                    attrs="{'required':[('picking_warn','!=','no-message')],'readonly':[('picking_warn','=','no-message')]}"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Warning on the Invoice" colspan="4"/>
+                            <field name="invoice_warn" nolabel="1" />
+                            <field name="invoice_warn_msg" colspan="3" nolabel="1" 
+                                    attrs="{'required':[('invoice_warn','!=','no-message')],'readonly':[('invoice_warn','=','no-message')]}"/>
+                        </group>
                     </page>
                 </notebook>
             </field>
@@ -48,18 +47,18 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Warnings">
-                    	<group colspan="2" col="2">
-	                        <separator string="Warning when Selling this Product" colspan="4"/>
-	                        <field name="sale_line_warn"  nolabel="1" />
-	                        <field name="sale_line_warn_msg" colspan="3" nolabel="1" 
-	                        		attrs="{'required':[('sale_line_warn','!=','no-message')],'readonly':[('sale_line_warn','=','no-message')]}"/>
-						</group>
                         <group colspan="2" col="2">
-                        	<separator string="Warning when Purchasing this Product" colspan="4" />
-                        	<field name="purchase_line_warn"  nolabel="1" />
-                        	<field name="purchase_line_warn_msg" colspan="3" nolabel="1" 
-                        			attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')]}"/>
-						</group>
+                            <separator string="Warning when Selling this Product" colspan="4"/>
+                            <field name="sale_line_warn"  nolabel="1" />
+                            <field name="sale_line_warn_msg" colspan="3" nolabel="1" 
+                                    attrs="{'required':[('sale_line_warn','!=','no-message')],'readonly':[('sale_line_warn','=','no-message')]}"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Warning when Purchasing this Product" colspan="4" />
+                            <field name="purchase_line_warn"  nolabel="1" />
+                            <field name="purchase_line_warn_msg" colspan="3" nolabel="1" 
+                                    attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')]}"/>
+                        </group>
                     </page>
                 </notebook>
             </field>
diff --git a/addons/wiki/__terp__.py b/addons/wiki/__openerp__.py
similarity index 97%
rename from addons/wiki/__terp__.py
rename to addons/wiki/__openerp__.py
index b15346dba39..033060ad1a7 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__openerp__.py
@@ -36,7 +36,6 @@
         'wizard/wizard_view.xml',
         'wizard/wiki_wiki_page_open_view.xml',
         'wizard/wiki_create_menu_view.xml',
-        'wizard/wiki_wiki_help_open_view.xml',
         'wizard/wiki_make_index_view.xml',
         'wiki_view.xml',
         'data/wiki_quickstart.xml',
diff --git a/addons/wiki/i18n/ar.po b/addons/wiki/i18n/ar.po
index b6f88ca9eee..83ffd46bfc0 100644
--- a/addons/wiki/i18n/ar.po
+++ b/addons/wiki/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/bg.po b/addons/wiki/i18n/bg.po
index 105db7c4f5c..c6710204d39 100644
--- a/addons/wiki/i18n/bg.po
+++ b/addons/wiki/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/bs.po b/addons/wiki/i18n/bs.po
index f583b6bbb30..728f24fa627 100644
--- a/addons/wiki/i18n/bs.po
+++ b/addons/wiki/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/ca.po b/addons/wiki/i18n/ca.po
index dc8054a8432..f809a8e033e 100644
--- a/addons/wiki/i18n/ca.po
+++ b/addons/wiki/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/cs.po b/addons/wiki/i18n/cs.po
index 88448113433..2f0aee61e29 100644
--- a/addons/wiki/i18n/cs.po
+++ b/addons/wiki/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/de.po b/addons/wiki/i18n/de.po
index 424d8ca7661..6cca7555b59 100644
--- a/addons/wiki/i18n/de.po
+++ b/addons/wiki/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/el.po b/addons/wiki/i18n/el.po
index ac59f6a6072..ad90657c28c 100644
--- a/addons/wiki/i18n/el.po
+++ b/addons/wiki/i18n/el.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/wiki/i18n/es.po b/addons/wiki/i18n/es.po
index eb18e52ac4c..01b0f3ef006 100644
--- a/addons/wiki/i18n/es.po
+++ b/addons/wiki/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/es_AR.po b/addons/wiki/i18n/es_AR.po
index c9838d489e1..5208eb94027 100644
--- a/addons/wiki/i18n/es_AR.po
+++ b/addons/wiki/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/et.po b/addons/wiki/i18n/et.po
index 853c69c58f2..4494dbb7193 100644
--- a/addons/wiki/i18n/et.po
+++ b/addons/wiki/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/fr.po b/addons/wiki/i18n/fr.po
index 54c4187ee7e..67cb672a4b4 100644
--- a/addons/wiki/i18n/fr.po
+++ b/addons/wiki/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/gl.po b/addons/wiki/i18n/gl.po
index 25677bff814..82acc45f7ef 100644
--- a/addons/wiki/i18n/gl.po
+++ b/addons/wiki/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/hr.po b/addons/wiki/i18n/hr.po
index a9afeb6f13c..a029c0522cb 100644
--- a/addons/wiki/i18n/hr.po
+++ b/addons/wiki/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/hu.po b/addons/wiki/i18n/hu.po
index b6f88ca9eee..83ffd46bfc0 100644
--- a/addons/wiki/i18n/hu.po
+++ b/addons/wiki/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/id.po b/addons/wiki/i18n/id.po
index 74567cb508d..de2e0d60a36 100644
--- a/addons/wiki/i18n/id.po
+++ b/addons/wiki/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/it.po b/addons/wiki/i18n/it.po
index 1ecb685619f..cae7205f97f 100644
--- a/addons/wiki/i18n/it.po
+++ b/addons/wiki/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/ko.po b/addons/wiki/i18n/ko.po
index b84ce100c8d..e824b46945f 100644
--- a/addons/wiki/i18n/ko.po
+++ b/addons/wiki/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/lt.po b/addons/wiki/i18n/lt.po
index b6f88ca9eee..83ffd46bfc0 100644
--- a/addons/wiki/i18n/lt.po
+++ b/addons/wiki/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/nl.po b/addons/wiki/i18n/nl.po
index 6a6a4020a7f..da7a2b4c64a 100644
--- a/addons/wiki/i18n/nl.po
+++ b/addons/wiki/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/nl_BE.po b/addons/wiki/i18n/nl_BE.po
index 301ef9f752c..a2860daecb9 100644
--- a/addons/wiki/i18n/nl_BE.po
+++ b/addons/wiki/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/pl.po b/addons/wiki/i18n/pl.po
index 755435a3e98..0277f9e1468 100644
--- a/addons/wiki/i18n/pl.po
+++ b/addons/wiki/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/pt.po b/addons/wiki/i18n/pt.po
index ec512f49b46..fd95c605f2e 100644
--- a/addons/wiki/i18n/pt.po
+++ b/addons/wiki/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/pt_BR.po b/addons/wiki/i18n/pt_BR.po
index cffe9339ac5..33a2262012e 100644
--- a/addons/wiki/i18n/pt_BR.po
+++ b/addons/wiki/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/ro.po b/addons/wiki/i18n/ro.po
index 968969dba15..17412fda967 100644
--- a/addons/wiki/i18n/ro.po
+++ b/addons/wiki/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/ru.po b/addons/wiki/i18n/ru.po
index 774bf28430d..6ea9b2a9256 100644
--- a/addons/wiki/i18n/ru.po
+++ b/addons/wiki/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/sk.po b/addons/wiki/i18n/sk.po
index 7a85795cd80..7ddc3cd3109 100644
--- a/addons/wiki/i18n/sk.po
+++ b/addons/wiki/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/sl.po b/addons/wiki/i18n/sl.po
index 6ef4342cd74..9c72048c488 100644
--- a/addons/wiki/i18n/sl.po
+++ b/addons/wiki/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/sr.po b/addons/wiki/i18n/sr.po
index a8346aff49b..10fd31ba887 100644
--- a/addons/wiki/i18n/sr.po
+++ b/addons/wiki/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/sv.po b/addons/wiki/i18n/sv.po
index 65a76434449..297f703c6b5 100644
--- a/addons/wiki/i18n/sv.po
+++ b/addons/wiki/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/tlh.po b/addons/wiki/i18n/tlh.po
index 7b5d1e00de6..66efed77d39 100644
--- a/addons/wiki/i18n/tlh.po
+++ b/addons/wiki/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index e93af51bbda..0fd7250c93c 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/uk.po b/addons/wiki/i18n/uk.po
index 133874e503c..e25b5cff537 100644
--- a/addons/wiki/i18n/uk.po
+++ b/addons/wiki/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/zh_CN.po b/addons/wiki/i18n/zh_CN.po
index 7056e06d5fe..d931e098086 100644
--- a/addons/wiki/i18n/zh_CN.po
+++ b/addons/wiki/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/zh_TW.po b/addons/wiki/i18n/zh_TW.po
index da94dfd37ad..6c2b7451709 100644
--- a/addons/wiki/i18n/zh_TW.po
+++ b/addons/wiki/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv
index 9ddfa27eee2..14ee1c656db 100644
--- a/addons/wiki/security/ir.model.access.csv
+++ b/addons/wiki/security/ir.model.access.csv
@@ -8,5 +8,4 @@
 "wiki_wizard_wiki_history_show_diff","wizard.wiki.history.show_diff","model_wizard_wiki_history_show_diff","base.group_user",1,1,1,1
 "wiki_wiki_page_open","wiki.wiki.page.open","model_wiki_wiki_page_open","base.group_user",1,1,1,1
 "wiki_create_menu","wiki.create.menu","model_wiki_create_menu","base.group_user",1,1,1,1
-"wiki_wiki_help_open","wiki.wiki.help.open","model_wiki_wiki_help_open","base.group_user",1,1,1,1
 "wiki_make_index","wiki.make.index","model_wiki_make_index","base.group_user",1,1,1,1
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 55b71b8ae10..a9b623611b8 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -27,6 +27,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 import difflib
 
 class Wiki(osv.osv):
@@ -44,19 +45,19 @@ class WikiGroup(osv.osv):
     _order = 'name'
 
     _columns = {
-       'name':fields.char('Wiki Group', size=256, select=True, required=True), 
-       'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'), 
-       'notes':fields.text("Description"), 
-       'create_date':fields.datetime("Created Date", select=True), 
-       'template': fields.text('Wiki Template'), 
-       'section': fields.boolean("Make Section ?"), 
+       'name':fields.char('Wiki Group', size=256, select=True, required=True),
+       'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'),
+       'notes':fields.text("Description"),
+       'create_date':fields.datetime("Created Date", select=True),
+       'template': fields.text('Wiki Template'),
+       'section': fields.boolean("Make Section ?"),
        'method':fields.selection([('list', 'List'), ('page', 'Home Page'), \
-                                   ('tree', 'Tree')], 'Display Method'), 
-       'home':fields.many2one('wiki.wiki', 'Pages'), 
+                                   ('tree', 'Tree')], 'Display Method'),
+       'home':fields.many2one('wiki.wiki', 'Home Page'),
     }
 
     _defaults = {
-        'method': lambda *a: 'page', 
+        'method': lambda *a: 'page',
     }
 
 WikiGroup()
@@ -70,7 +71,7 @@ class GroupLink(osv.osv):
     _rec_name = 'action_id'
 
     _columns = {
-       'group_id': fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'), 
+       'group_id': fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
        'action_id': fields.many2one('ir.ui.menu', 'Menu')
     }
 
@@ -85,22 +86,22 @@ class Wiki(osv.osv):
     _order = 'section,create_date desc'
 
     _columns = {
-        'name': fields.char('Title', size=256, select=True, required=True), 
-        'write_uid': fields.many2one('res.users', "Last Author"), 
-        'text_area': fields.text("Content"), 
-        'create_uid': fields.many2one('res.users', 'Author', select=True), 
-        'create_date': fields.datetime("Created on", select=True), 
-        'write_date': fields.datetime("Modification Date", select=True), 
-        'tags': fields.char('Tags', size=1024), 
-        'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'), 
-        'minor_edit': fields.boolean('Minor edit', select=True), 
-        'summary': fields.char('Summary', size=256), 
-        'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"), 
-        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'), 
-        'toc': fields.boolean('Table of Contents'), 
-        'review': fields.boolean('Need Review'), 
-        'parent_id': fields.many2one('wiki.wiki', 'Parent Page'), 
-        'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'), 
+        'name': fields.char('Title', size=256, select=True, required=True),
+        'write_uid': fields.many2one('res.users', "Last Author"),
+        'text_area': fields.text("Content"),
+        'create_uid': fields.many2one('res.users', 'Author', select=True),
+        'create_date': fields.datetime("Created on", select=True),
+        'write_date': fields.datetime("Modification Date", select=True),
+        'tags': fields.char('Tags', size=1024),
+        'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'),
+        'minor_edit': fields.boolean('Minor edit', select=True),
+        'summary': fields.char('Summary', size=256),
+        'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"),
+        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
+        'toc': fields.boolean('Table of Contents'),
+        'review': fields.boolean('Need Review'),
+        'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
+        'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
     }
 
     def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
@@ -125,7 +126,7 @@ class Wiki(osv.osv):
         section = '.'.join(s)
         return {
             'value':{
-                'text_area': template, 
+                'text_area': template,
                 'section': section
             }
         }
@@ -147,10 +148,10 @@ class Wiki(osv.osv):
         history = self.pool.get('wiki.wiki.history')
         if vals.get('text_area'):
             res = {
-                'minor_edit': vals.get('minor_edit', True), 
-                'text_area': vals.get('text_area', ''), 
-                'write_uid': uid, 
-                'wiki_id': id, 
+                'minor_edit': vals.get('minor_edit', True),
+                'text_area': vals.get('text_area', ''),
+                'write_uid': uid,
+                'wiki_id': id,
                 'summary':vals.get('summary', '')
             }
             history.create(cr, uid, res)
@@ -166,15 +167,37 @@ class Wiki(osv.osv):
         if vals.get('text_area'):
             for id in ids:
                 res = {
-                    'minor_edit': vals.get('minor_edit', True), 
-                    'text_area': vals.get('text_area', ''), 
-                    'write_uid': uid, 
-                    'wiki_id': id, 
+                    'minor_edit': vals.get('minor_edit', True),
+                    'text_area': vals.get('text_area', ''),
+                    'write_uid': uid,
+                    'wiki_id': id,
                     'summary': vals.get('summary', '')
                 }
                 history.create(cr, uid, res)
         return result
 
+    def open_wiki_page(self, cr, uid, ids, context):
+
+        """ Opens Wiki Page for Editing
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of wiki page’s IDs
+
+        """
+        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
+        if not pages:
+           raise osv.except_osv(_('Warning !'), _("No Help page is defined"))
+        value = {
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'wiki.wiki',
+            'view_id': False,
+            'res_id': pages[0],
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+        }
+        return value
+
 Wiki()
 
 
@@ -187,16 +210,16 @@ class History(osv.osv):
     _order = 'id DESC'
 
     _columns = {
-              'create_date': fields.datetime("Date", select=True), 
-              'text_area': fields.text("Text area"), 
-              'minor_edit': fields.boolean('This is a major edit ?', select=True), 
-              'summary': fields.char('Summary', size=256, select=True), 
-              'write_uid': fields.many2one('res.users', "Modify By", select=True), 
+              'create_date': fields.datetime("Date", select=True),
+              'text_area': fields.text("Text area"),
+              'minor_edit': fields.boolean('This is a major edit ?', select=True),
+              'summary': fields.char('Summary', size=256, select=True),
+              'write_uid': fields.many2one('res.users', "Modify By", select=True),
               'wiki_id': fields.many2one('wiki.wiki', 'Wiki Id', select=True)
             }
 
     _defaults = {
-        'write_uid': lambda obj, cr, uid, context: uid, 
+        'write_uid': lambda obj, cr, uid, context: uid,
     }
 
     def getDiff(self, cr, uid, v1, v2, context={}):
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 875aa460f6a..4675cea75f9 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -2,17 +2,17 @@
 <openerp>
     <data>
        <menuitem name="Knowledge Management" icon="terp-stock"
-       	id="base.menu_document" sequence="4" />
+           id="base.menu_document" sequence="4" />
 
        <menuitem name="Configuration"
-       	id="base.menu_document_configuration"
-       	parent="base.menu_document" sequence="50" />
+           id="base.menu_document_configuration"
+           parent="base.menu_document" sequence="50" />
 
        <menuitem name="Wiki" id="menu_wiki_configuration"
-       	parent="base.menu_document_configuration" sequence="2" />
+           parent="base.menu_document_configuration" sequence="2" />
 
        <menuitem id="base.menu_document2" name="Collaborative Content"
-       	parent="base.menu_document" />
+           parent="base.menu_document" />
 
 <!--  Wiki Groups Tree view -->
 
@@ -40,7 +40,7 @@
                         <field name="create_date" readonly="2"/>
                         <field name="method" select="1"/>
                         <field name="home" select="1"
-                        	attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
+                            attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
                     </group>
                     <notebook colspan="4">
                     <page string="Notes">
@@ -51,10 +51,10 @@
                     </page>
                     </notebook>
                      <button
-			 	    	name="%(wiki.action_wiki_create_menu)d"
-			 	    	string="Create Menu"
-			 	     	type="action"
-			 	     	icon="gtk-justify-fill" />
+                         name="%(wiki.action_wiki_create_menu)d"
+                         string="Create Menu"
+                          type="action"
+                          icon="gtk-justify-fill" />
                 </form>
             </field>
         </record>
@@ -124,20 +124,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Wiki">
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="name" select="1" colspan="6"/>
                         <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
-                        <field name="section" select="2" invisible="not context.get('section',False)"/>
+                        <field name="section" invisible="not context.get('section',False)"/>
                         <field name="parent_id"/>
+                        <button name="open_wiki_page" type="object"
+                        string="Basic Wiki Editing" icon="gtk-ok" />
                     </group>
+
                     <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                     <separator colspan="4" string="Modifications"/>
                     <group col="6" colspan="4">
-                        <field name="write_date" readonly="1" select="2"/>
+                        <field name="write_date" readonly="1"/>
                         <field name="review" select="1"/>
                         <field name="toc"/>
                         <field name="tags" select="1" groups="base.group_extended"/>
-                        <field name="summary" colspan="4" select="2" groups="base.group_extended"/>
+                        <field name="summary" colspan="4" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
@@ -145,7 +148,7 @@
 
 <!-- wiki Search view  -->
 
-		<record id="view_wiki_filter" model="ir.ui.view">
+        <record id="view_wiki_filter" model="ir.ui.view">
             <field name="name">wiki.wiki.search</field>
             <field name="model">wiki.wiki</field>
             <field name="type">search</field>
@@ -176,8 +179,8 @@
         </record>
 
         <menuitem parent="base.menu_document2"
-        	id="menu_action_wiki_wiki" name="Wiki Pages"
-        	action="action_wiki" />
+            id="menu_action_wiki_wiki" name="Wiki Pages"
+            action="action_wiki" />
 
 <!--  Pages Waiting Review -->
 
@@ -250,7 +253,7 @@
             <field name="key2">tree_but_open</field>
             <field name="model">wiki.groups</field>
             <field name="name">Search a Page</field>
-            <field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
+             <field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
             <field eval="True" name="object"/>
         </record>
 
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index 739966e5557..90b18b261ea 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -21,8 +21,7 @@
 
 import wiki_wiki_page_open
 import wiki_create_menu
-import wiki_wiki_help_open
 import wiki_make_index
-import show_diff
+import wiki_show_diff
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 3e5a87d4462..f9b0acbf273 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -12,10 +12,12 @@
               <form string="Create Menu">
     			<separator string="Menu Information" colspan="4"/>
     			<label string="Want to create a Index on Selected Pages ? "/>
-    			<separator string="" colspan="4" />
-    	        <label string="" colspan="2" />
-        	    <button special="cancel" string="Cancel" />
-            	<button name="wiki_do_index" string="Create Index" type="object"/>
+    			<separator string="" colspan="6" />
+    	        <label string="" colspan="2"/>
+    	        <group>
+        	    <button special="cancel" string="Cancel" icon="gtk-cancel" />
+            	<button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
+            	</group>
 			</form>
             </field>
 		</record>
diff --git a/addons/wiki/wizard/show_diff.py b/addons/wiki/wizard/wiki_show_diff.py
similarity index 93%
rename from addons/wiki/wizard/show_diff.py
rename to addons/wiki/wizard/wiki_show_diff.py
index 83708a8d8ce..d1a17f0fa45 100644
--- a/addons/wiki/wizard/show_diff.py
+++ b/addons/wiki/wizard/wiki_show_diff.py
@@ -27,14 +27,13 @@ class showdiff(osv.osv_memory):
 
     _name = 'wizard.wiki.history.show_diff'
 
-    def _get_diff(self, cr, uid, ctx):
+    def get_diff(self, cr, uid, context=None):
 
         """ @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         """
-
         history = self.pool.get('wiki.wiki.history')
-        ids = ctx.get('active_ids')
+        ids = context.get('active_ids')
         diff = ""
         if len(ids) == 2:
             if ids[0] > ids[1]:
@@ -49,14 +48,15 @@ class showdiff(osv.osv_memory):
             diff = history.getDiff(cr, uid, ids[0], nids[-1])
         else:
             raise osv.except_osv(_('Warning'), _('You need to select minimum 1 or maximum 2 history revision!'))
+
         return diff
 
     _columns = {
-        'diff': fields.text('Diff'), 
+        'diff': fields.text('Diff'),
     }
 
     _defaults = {
-        'diff': _get_diff
+        'diff': get_diff
     }
 
 showdiff()
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
new file mode 100644
index 00000000000..ec8fcb3ca6d
--- /dev/null
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!-- Create Index Form view  -->
+
+    	<record id="view_wiki_show_diff" model="ir.ui.view">
+            <field name="name">Show Difference</field>
+            <field name="model">wizard.wiki.history.show_diff</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Difference">
+    			 <separator colspan="4" string="Notes"/>
+    			 <field name="diff" nolabel="1" colspan="4" width="300"/>
+    	        <label string="" colspan="2" />
+    	        <group>
+        	    <button special="cancel" string="OK" icon="gtk-ok" />
+            	</group>
+			</form>
+            </field>
+		</record>
+
+<!-- Create Index Action  -->
+
+		<record id="action_view_wiki_show_diff" model="ir.actions.act_window">
+            <field name="name">Difference</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wizard.wiki.history.show_diff</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+
+<!-- Create Index Action Window  -->
+
+		 <act_window id="action_view_wiki_show_diff_values"
+    		key2="client_action_multi" name="Difference"
+    		res_model="wizard.wiki.history.show_diff" src_model="wiki.wiki.history"
+    		view_mode="form" target="new" view_type="form" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_wiki_help_open.py b/addons/wiki/wizard/wiki_wiki_help_open.py
deleted file mode 100644
index 1333f80b96f..00000000000
--- a/addons/wiki/wizard/wiki_wiki_help_open.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class wiki_wiki_help_open(osv.osv_memory):
-    """ Basic Wiki Editing """
-    _name = "wiki.wiki.help.open"
-    _description = "Basic Wiki Editing"
-
-    def open_wiki_page(self, cr, uid, ids, context):
-
-        """ Opens Wiki Page for Editing
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of wiki page’s IDs
-
-        """
-        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
-
-        value = {
-            'view_type': 'form', 
-            'view_mode': 'form,tree', 
-            'res_model': 'wiki.wiki', 
-            'view_id': False, 
-            'res_id': pages[0], 
-            'type': 'ir.actions.act_window', 
-        }
-
-        return value
-
-wiki_wiki_help_open()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/wiki/wizard/wiki_wiki_help_open_view.xml b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
deleted file mode 100644
index 226ceab271f..00000000000
--- a/addons/wiki/wizard/wiki_wiki_help_open_view.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-<!-- Editing Page Form view  -->
-
-    	<record id="view_wiki_wiki_help_open" model="ir.ui.view">
-            <field name="name">Basic Wiki Editing</field>
-            <field name="model">wiki.wiki.help.open</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Open Help">
-             	 <separator string="" colspan="6" />
-              	 <label string="" colspan="2" />
-                 <button name="open_wiki_page" string="Basic Wiki Editing" type="object"/>
-             </form>
-            </field>
-		</record>
-
-<!-- Editing Page Action  -->
-
-		<record id="action_view_wiki_wiki_help_open" model="ir.actions.act_window">
-            <field name="name">Basic Wiki Editing</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wiki.wiki.help.open</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-<!-- Editing Page Action window -->
-
-        <act_window id="action_view_wiki_wiki_help_open_vals"
-    		key2="client_action_multi" name="Basic Wiki Editing"
-    		res_model="wiki.wiki.help.open" src_model="wiki.wiki"
-    		view_mode="form" target="new" view_type="form" />
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index d65748f989a..d6b8f4f0285 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -35,18 +35,17 @@ class wiki_wiki_page_open(osv.osv_memory):
         @param ids: List of open wiki page’s IDs
         @return: dictionay of open wiki window on give group id
         """
-
-        for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
-
+        group_ids = context.get('active_ids', [])
+        for group in self.pool.get('wiki.groups').browse(cr, uid, group_ids):
             value = {
-                'domain': "[('group_id','=',%d)]" % (group.id), 
-                'name': 'Wiki Page', 
-                'view_type': 'form', 
-                'view_mode': 'form,tree', 
-                'res_model': 'wiki.wiki', 
-                'view_id': False, 
-                'type': 'ir.actions.act_window', 
-        }
+                'domain': "[('group_id','=',%d)]" % (group.id),
+                'name': 'Wiki Page',
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'wiki.wiki',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                }
         if group.method == 'page':
             value['res_id'] = group.home.id
         elif group.method == 'list':
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index d0c41d0d37f..507f3d5cdac 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -11,8 +11,13 @@
             <field name="arch" type="xml">
               <form string="Open Page">
              	<separator string="" colspan="6" />
-              	<label string="" colspan="2" />
-               	<button name="open_wiki_page" string="Open Wiki Page" type="object"/>
+              	<label string="Want to open a wiki page? "/>
+              	<separator string="" colspan="6" />
+    	        <label string="" colspan="2" />
+    	        <group>
+        	    <button special="cancel" string="Cancel" icon="gtk-cancel" />
+               	<button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
+               	</group>
              </form>
             </field>
 		</record>
diff --git a/addons/wiki_faq/__terp__.py b/addons/wiki_faq/__openerp__.py
similarity index 100%
rename from addons/wiki_faq/__terp__.py
rename to addons/wiki_faq/__openerp__.py
diff --git a/addons/wiki_quality_manual/__terp__.py b/addons/wiki_quality_manual/__openerp__.py
similarity index 100%
rename from addons/wiki_quality_manual/__terp__.py
rename to addons/wiki_quality_manual/__openerp__.py