[MERGE]

bzr revid: uco@tinyerp.com-20101230060753-wujam7otb5f13f0z
author: uco (OpenERP) <uco@tinyerp.com> 2010-12-30 11:37:53 +0530
committer: uco (OpenERP) <uco@tinyerp.com> 2010-12-30 11:37:53 +0530
commit: e0416f8a8fb82174fdaafdbf4bb6dfced55a2b04 (patch)
tree: 5d46c1dd0eb72bf230a4bcbf9d7980ada4c8fd51 /addons
parent: c3098f4f437708c7b2d6d4a52cd02950c5b67f31 (diff)
parent: b352cf0e20d1e17f4cdbd93c3c388fc0004ea50a (diff)
661 files changed, 8572 insertions, 3527 deletions
diff --git a/addons/account/account.py b/addons/account/account.py
index 470282fadcd..f79e36c7681 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -204,7 +204,7 @@ class account_account(osv.osv):
                 args[pos] = ('id', 'in', ids1)
             pos += 1
 
-        if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts
+        if context and context.has_key('consolidate_children'): #add consolidated children of accounts
             ids = super(account_account, self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
             for consolidate_child in self.browse(cr, uid, context['account_id'], context=context).child_consol_ids:
@@ -285,6 +285,7 @@ class account_account(osv.osv):
             children_and_consolidated.reverse()
             brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
             sums = {}
+            currency_obj = self.pool.get('res.currency')
             while brs:
                 current = brs[0]
 #                can_compute = True
@@ -299,8 +300,11 @@ class account_account(osv.osv):
                 brs.pop(0)
                 for fn in field_names:
                     sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
-                    if current.child_id:
-                        sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
+                    for child in current.child_id:
+                        if child.company_id.currency_id.id == current.company_id.currency_id.id:
+                            sums[current.id][fn] += sums[child.id][fn]
+                        else:
+                            sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
             res = {}
             null_result = dict((fn, 0.0) for fn in field_names)
             for id in ids:
@@ -607,8 +611,8 @@ class account_journal(osv.osv):
     }
 
     _defaults = {
-        'user_id': lambda self,cr,uid,context: uid,
-        '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, context: uid,
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     _sql_constraints = [
         ('code_company_uniq', 'unique (code, company_id)', 'The code of the journal must be unique per company !'),
@@ -708,7 +712,6 @@ class account_journal(osv.osv):
 
         return self.name_get(cr, user, ids, context=context)
 
-
     def onchange_type(self, cr, uid, ids, type, currency, context=None):
         obj_data = self.pool.get('ir.model.data')
         user_pool = self.pool.get('res.users')
@@ -1278,6 +1281,8 @@ class account_move(osv.osv):
         return super(account_move, self).copy(cr, uid, id, default, context)
 
     def unlink(self, cr, uid, ids, context=None, check=True):
+        if context is None:
+            context = {}
         toremove = []
         obj_move_line = self.pool.get('account.move.line')
         for move in self.browse(cr, uid, ids, context=context):
@@ -1916,7 +1921,7 @@ class account_tax(osv.osv):
         RETURN:
             [ tax ]
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
-            one tax for each tax id in IDS and their childs
+            one tax for each tax id in IDS and their children
         """
         res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
         total = 0.0
@@ -2011,7 +2016,7 @@ class account_tax(osv.osv):
         RETURN:
             [ tax ]
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
-            one tax for each tax id in IDS and their childs
+            one tax for each tax id in IDS and their children
         """
         res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
         total = 0.0
@@ -2611,11 +2616,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
         configured_cmp = [r[0] for r in cr.fetchall()]
         unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
-        if unconfigured_cmp:
-            cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
-            for field in res['fields']:
-               if field == 'company_id':
-                   res['fields'][field]['domain'] = unconfigured_cmp
+        for field in res['fields']:
+           if field == 'company_id':
+               res['fields'][field]['domain'] = unconfigured_cmp
+               res['fields'][field]['selection'] = [('', '')]
+               if unconfigured_cmp:
+                   cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
                    res['fields'][field]['selection'] = cmp_select
         return res
 
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index e24e763ff56..b59df303170 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -50,11 +50,10 @@ class account_analytic_line(osv.osv):
         if context is None:
             context = {}
         if context.get('from_date',False):
-            args.append(['date', '>=',context['from_date']])
+            args.append(['date', '>=', context['from_date']])
 
         if context.get('to_date',False):
-            args.append(['date','<=',context['to_date']])
-
+            args.append(['date','<=', context['to_date']])
         return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
 
@@ -158,4 +157,4 @@ class res_partner(osv.osv):
 
 res_partner()
 
-# 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/account_end_fy.xml b/addons/account/account_end_fy.xml
index 5f4ed44adfe..650bffc58e9 100644
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@@ -14,7 +14,7 @@
             action="action_account_period_tree"
             id="menu_action_account_period_close_tree"
             parent="account.menu_account_end_year_treatments"
-            sequence="0" groups="base.group_extended,group_account_manager,group_account_user"/>
+            sequence="0" groups="base.group_extended"/>
         
     </data>
 </openerp>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 22ab46a1775..7b7e6b308b1 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -26,14 +26,19 @@
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
-        <menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="base.group_extended,group_account_manager"/>
-        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
+        <menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="group_account_manager"/>
+        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
         <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended,group_account_manager,group_account_user"/>
 
-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager,group_account_user" sequence="25"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
+            parent="menu_finance_periodical_processing" sequence="15"
+            groups="base.group_extended"/>
+
+        <menuitem id="menu_account_end_year_treatments"
+            name="End of Period" parent="menu_finance_periodical_processing"
+            sequence="25"/>
         <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
 
         <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 02b8be3a8c1..2522e53b2a0 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -309,7 +309,7 @@ class account_move_line(osv.osv):
             context = {}
         c = context.copy()
         c['initital_bal'] = True
-        sql = """SELECT l2.id, SUM(l1.debit-l1.credit) 
+        sql = """SELECT l2.id, SUM(l1.debit-l1.credit)
                     FROM account_move_line l1, account_move_line l2
                     WHERE l2.account_id = l1.account_id
                       AND l1.id <= l2.id
@@ -318,8 +318,7 @@ class account_move_line(osv.osv):
                 " GROUP BY l2.id"
 
         cr.execute(sql, [tuple(ids)])
-        res = dict(cr.fetchall())
-        return res
+        return dict(cr.fetchall())
 
     def _invoice(self, cursor, user, ids, name, arg, context=None):
         invoice_obj = self.pool.get('account.invoice')
@@ -887,7 +886,7 @@ class account_move_line(osv.osv):
         fld = []
         fields = {}
         flds = []
-        title = "Accounting Entries" #self.view_header_get(cr, uid, view_id, view_type, context)
+        title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
         xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
 
         ids = journal_pool.search(cr, uid, [])
@@ -906,8 +905,8 @@ class account_move_line(osv.osv):
                 else:
                     fields.get(field.field).append(journal.id)
                     common_fields[field.field] = common_fields[field.field] + 1
-        fld.append(('period_id', 3, 'Period'))
-        fld.append(('journal_id', 10, 'Journal'))
+        fld.append(('period_id', 3, _('Period')))
+        fld.append(('journal_id', 10, _('Journal')))
         flds.append('period_id')
         flds.append('journal_id')
         fields['period_id'] = all_journal
@@ -927,10 +926,10 @@ class account_move_line(osv.osv):
 #                state = 'colors="red:state==\'draft\'"'
             attrs = []
             if field == 'debit':
-                attrs.append('sum = "Total debit"')
+                attrs.append('sum = "%s"' % _("Total debit"))
 
             elif field == 'credit':
-                attrs.append('sum = "Total credit"')
+                attrs.append('sum = "%s"' % _("Total credit"))
 
             elif field == 'move_id':
                 attrs.append('required = "False"')
@@ -1284,4 +1283,4 @@ class account_move_line(osv.osv):
 
 account_move_line()
 
-# 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/account_view.xml b/addons/account/account_view.xml
index a8b3f5ad31d..db2984b5593 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -276,6 +276,7 @@
                     <field name="company_currency_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="type"/>
+                    <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -762,7 +763,7 @@
             <field name="search_view_id" ref="view_account_type_search"/>
             <field name="help">An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company.</field>
         </record>
-        <menuitem action="action_account_type_form" groups="base.group_extended,group_account_manager" sequence="6" id="menu_action_account_type_form" parent="account_account_menu"/>
+        <menuitem action="action_account_type_form" sequence="6" id="menu_action_account_type_form" parent="account_account_menu"/>
         <!--
     Entries
     -->
@@ -1227,7 +1228,7 @@
             id="menu_action_account_moves_all"
             parent="account.menu_finance_entries"
             sequence="1"
-            groups="group_account_user,group_account_manager"
+            groups="group_account_user"
         />
 
         <record id="action_move_line_select" model="ir.actions.act_window">
@@ -1475,7 +1476,7 @@
             action="action_move_journal_line"
             id="menu_action_move_journal_line_form"
             parent="account.menu_finance_entries"
-            groups="group_account_user,group_account_manager"
+            groups="group_account_user"
             sequence="5"/>
 
         <record id="action_move_line_form" model="ir.actions.act_window">
@@ -1742,7 +1743,7 @@
         </record>
         <menuitem
             action="action_model_form" id="menu_action_model_form" sequence="5"
-            parent="account.menu_configuration_misc" groups="base.group_extended,group_account_manager"/>
+            parent="account.menu_configuration_misc" groups="base.group_extended"/>
 
         <!--
             # Payment Terms
@@ -1842,8 +1843,7 @@
             <field name="search_view_id" ref="view_payment_term_search"/>
         </record>
         <menuitem action="action_payment_term_form"
-            id="menu_action_payment_term_form" parent="menu_configuration_misc"
-            groups="group_account_manager"/>
+            id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
 
         <!--
         # Account Subscriptions
@@ -1958,7 +1958,7 @@
         </record>
         <menuitem
             name="Define Recurring Entries" action="action_subscription_form"
-            groups="base.group_extended,group_account_manager,group_account_user"
+            groups="base.group_extended"
             id="menu_action_subscription_form" sequence="1"
             parent="account.menu_finance_recurrent_entries"/>
 
@@ -2063,7 +2063,7 @@
 
         <act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id]}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
 
-        <act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner"/>
+        <act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
@@ -2095,17 +2095,17 @@
             id="account_template_folder"
             name="Templates"
             parent="menu_finance_accounting"
-            groups="base.group_multi_company,group_account_manager"/>
+            groups="base.group_multi_company"/>
         <menuitem
             id="account_template_taxes"
             name="Taxes"
             parent="account_template_folder"
-            groups="base.group_multi_company,group_account_manager" sequence="2"/>
+            sequence="2"/>
         <menuitem
             id="account_template_accounts"
             name="Accounts"
             parent="account_template_folder"
-            groups="base.group_multi_company,group_account_manager" sequence="1"/>
+            sequence="1"/>
 
 
         <record id="view_account_template_form" model="ir.ui.view">
@@ -2751,8 +2751,8 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
             <field name="view_id" ref="account_cash_statement_graph"/>
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
-        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
-            groups="group_account_user,group_account_manager"/>
+        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines"
+            parent="menu_finance_bank_and_cash"/>
 
         <record id="action_partner_all" model="ir.actions.act_window">
             <field name="name">Partners</field>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index a71884e6d54..f81f8bb4f6b 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -7426,7 +7426,7 @@ msgstr ""
 
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
-msgid "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report"
+msgid "This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index dd0676f253e..68aad9e9f21 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-12-24 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7845,9 +7845,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index dbbd21e50d8..8ab36111445 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/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-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7876,9 +7876,9 @@ msgstr "Вид отпратка"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index 2a061082fd8..92c8df05ee3 100644
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/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-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 5322c0d60a9..dfa9bd472dc 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-12-24 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7900,9 +7900,9 @@ msgstr "Tip reference"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index f925b4f45cf..252eda0f7d9 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7935,9 +7935,9 @@ msgstr "Tipus referència"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 0bfa2c08c6f..a73284105cf 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-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7842,9 +7842,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index f1c57937954..d4c7c605787 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-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7862,9 +7862,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 6fb7d341308..59e85405ccb 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-25 20:08+0000\n"
+"PO-Revision-Date: 2010-12-28 21:39+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8408,9 +8408,9 @@ msgstr "Referenztyp"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 "Dieses Konto wird als vorläufiges Konto für einen Gewinn oder Verlust aus "
 "dem Geschäftsjahr verwendet (Bei vorläufigem Gewinn: Betrag wird "
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 49f706f26d3..7bd646fc715 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-25 22:00+0000\n"
+"PO-Revision-Date: 2010-12-28 07:19+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -962,7 +962,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Κατάσταση κίνησης λογ. τραπέζης"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -1067,7 +1067,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Επιλογές Προσαρμοστικότητας"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1078,7 +1078,7 @@ msgstr "Με διαφορές"
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr ""
+msgstr "Ταμειακές Μηχανές"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1219,7 +1219,7 @@ msgstr "Λογαριασμός"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Περιλαμβάνεται στην τιμή βάσης"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1262,7 +1262,7 @@ msgstr "Πρότυπα για Λογαριασμούς"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Αναζήτηση προτύπου φόρου"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1302,7 +1302,7 @@ msgstr "Επιλογές Αναφοράς"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Ανάλυση Στοιχείων Ημερολογίου"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_partner_all
@@ -1392,7 +1392,7 @@ msgstr "# ψηφίων"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Παράβλεψη κατάστασης 'Πρόχειρου' για Χειροκίνητες Έισαγωγές"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1435,6 +1435,9 @@ msgid ""
 "The payment term defined gives a computed amount greater than the total "
 "invoiced amount."
 msgstr ""
+"Δεν μπορεί να δημιουργηθεί τιμολόγιο !\n"
+"Ο όρος πληρωμής που ορίζεται δίνει υπολογιζόμενο ποσό μεγαλύτερο από το "
+"συνολικό ποσό τιμολόγισης."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -1636,7 +1639,7 @@ msgstr "Εκτύπωση παραστατικού"
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Ο οδηγός θα αλλάξει το νόμισμα στο τιμολόγιο"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1655,7 +1658,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "The account is not defined to be reconciled !"
-msgstr ""
+msgstr "Ο λογαριασμός δεν ορίζεται για συμψηφισμό !"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -7963,9 +7966,9 @@ msgstr "Τύπος Παραπομπής"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
@@ -9603,7 +9606,7 @@ msgstr "Τραπεζικός Λογαριασμός"
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr ""
+msgstr "Κεντρικό Ημερολόγιο Λογαριασμού"
 
 #. module: account
 #: report:account.overdue:0
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 78630f2c906..73c1bc7fafd 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 23:05+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 19:28+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -400,9 +399,9 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
-"Los contables utilizan esta vista para introducir asientos masivamente en "
-"OpenERP. OpenERP crea los asientos contables si utiliza extractos bancarios, "
-"registros de caja o pagos de cliente/proveedor."
+"Los contables utilizan esta vista para introducir apuntes masivamente en "
+"OpenERP. Cuando utiliza los extractos bancarios, hojas de caja, o pagos de "
+"cliente/proveedor OpenERP crea automáticamente apuntes contables."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -2154,7 +2153,7 @@ msgstr "Descripción"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "ACOMPRA"
 
 #. module: account
 #: view:account.subscription:0
@@ -2370,6 +2369,13 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Este menú imprime una declaración de IVA basada en facturas o pagos. "
+"Seleccione uno o varios periodos del ejercicio fiscal. La información "
+"necesaria para la declaración de IVA es generada automáticamente por OpenERP "
+"a partir de las facturas (o pagos, en algunos países). Esta información se "
+"actualiza en tiempo real. Es muy útil porque le permite previsualizar en "
+"cualquier momento los impuestos que debe al principio y fin del mes o "
+"trimestre."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2406,7 +2412,7 @@ msgstr "Contabilidad. Líneas de modelo"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "EXJ"
-msgstr "GASTO"
+msgstr "COMPRA"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -3077,6 +3083,15 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"Establezca aquí el método que se usará, el asistente genérico, para crear el "
+"asiento de cierre de ejercicio para todas las cuentas de este tipo.\n"
+"\n"
+" 'Ninguno' significa que no se hará nada.\n"
+" 'Saldo' normalmente se usará para cuentas de efectivo.\n"
+" 'Detallado' copiará cada apunte del ejercicio anterior, incluso los no "
+"conciliados.\n"
+" 'Sin conciliar' copiará sólo los apuntes aun no conciliados el primer día "
+"del nuevo ejercicio fiscal."
 
 #. module: account
 #: view:account.tax:0
@@ -4739,6 +4754,15 @@ msgid ""
 "calendar year gives many companies an advantage, allowing them to close "
 "their books at a time which is most convenient for them."
 msgstr ""
+"Defina el ejercicio fiscal de su compañía según la periodicidad que ha "
+"decidido seguir. Un ejercicio fiscal es un periodo de 1 año sobre el cual la "
+"compañía presupuesta sus gastos. Puede incluir cualquier periodo de 12 "
+"meses. El ejercicio fiscal suele denominarse según la fecha en la que acaba. "
+"Así, si el ejercicio fiscal de una compañía finaliza el 30 de noviembre de "
+"2011, entonces todo lo comprendido entre el 1 de diciembre de 2010 y el 30 "
+"de noviembre de 2011 será considerado como el EF 2011. No usar el calendario "
+"natural es una ventaja para muchas compañías, ya que les permite cerrar sus "
+"libros en el momento más conveniente para ellas."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
@@ -5677,6 +5701,12 @@ msgid ""
 "all lines of your statement. When you are in the Payment column of the a "
 "line, you can press F1 to open the reconciliation form."
 msgstr ""
+"Un extracto bancario es un resumen de todas las transacciones financieras "
+"ocurridas durante un periodo determinado de tiempo en una cuenta bancaria, "
+"tarjeta de crédito o cualquier otro tipo de cuenta. Comience introduciendo "
+"el saldo de apertura y cierre, y luego introduzca todas las lineas de su "
+"extracto. Situándose en la columna Pago de una línea, puede pulsar F1 para "
+"abrir el formulario de conciliación."
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -6368,6 +6398,9 @@ msgid ""
 "o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
 "o.journal_id.currency and o.journal_id.currency.symbol"
 msgstr ""
+"o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
+"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
+"o.journal_id.currency and o.journal_id.currency.symbol"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -6400,6 +6433,11 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"Para que una factura se considere pagada, los apuntes contables de la "
+"factura deben estar conciliados con sus contrapartidas, normalmente pagos. "
+"Con la funcionalidad de reconciliación automática, OpenERP realiza su propia "
+"búsqueda de apuntes a conciliar en una serie de cuentas. Encuentra los "
+"apuntes, para cada tercero, donde las cantidades se correspondan."
 
 #. module: account
 #: view:account.move:0
@@ -6533,6 +6571,9 @@ msgid ""
 "Account Voucher module includes all the basic requirements of Voucher "
 "Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
 msgstr ""
+"El módulo de recibos (justificantes) contables incluye todos los requisitos "
+"básicos de justificantes bancarios, de caja, ventas, compras, gastos, "
+"contrapartidas, etc... "
 
 #. module: account
 #: view:account.chart.template:0
@@ -6665,6 +6706,12 @@ msgid ""
 "Create and manage them from here and decide whether a period should be left "
 "open or closed depending on your company's activities over a specific period."
 msgstr ""
+"Aquí puede definir un periodo, un intervalo de tiempo entre cierres "
+"consecutivos de los libros de su compañía. Un periodo contable es "
+"típicamente un mes o un trimestre, correspondientemente al régimen "
+"impositivo usado en el negocio. Creelos y gestionelos desde aquí, y decida "
+"si un periodo debe permanecer abierto o cerrado según las actividades de su "
+"compañía en un plazo específico."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
@@ -6733,6 +6780,13 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"El plan de cuentas normales tiene una estructura predefinida por los "
+"requisitos legales del país. La estructura del plan de cuentas analíticas "
+"debería reflejar las necesidades de su negocio de cara al análisis de costes "
+"e ingresos. Por lo general se estructuran por contratos, proyectos, "
+"productos o departamentos. La mayoría de las operaciones de OpenERP "
+"(facturas, hojas de servicio, gastos, etc) generan asientos analíticos en la "
+"cuenta asociada."
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
@@ -6807,6 +6861,26 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"Módulo financiero y contable que cubre:\n"
+"    Contabilidad general\n"
+"    Contabilidad analítica / de costes\n"
+"    Gestión de terceros\n"
+"    Gestión de impuestos\n"
+"    Presupuestos\n"
+"    Facturación de clientes y proveedores\n"
+"    Extractos bancarios\n"
+"    Conciliación por tercero\n"
+"    Crea un cuadro de mandos para contables que incluye:\n"
+"    * Lista de presupuestos sin facturar\n"
+"    * Gráfica de cuentas vencidas a cobrar\n"
+"    * Gráfica de efectos a cobrar\n"
+"\n"
+"Los procesos, como el mantenimiento del libro mayor se realizan a través de "
+"los diarios financieros definidos\n"
+"(los asientos se agrupan por diario) para un ejercicio fiscal determinado; y "
+"para la preparación de recibos \n"
+"existe un módulo llamado account_voucher.\n"
+"    "
 
 #. module: account
 #: report:account.invoice:0
@@ -6998,6 +7072,11 @@ msgid ""
 "line of the expense account, OpenERP will propose to you automatically the "
 "Tax related to this account and the counter-part \"Account Payable\"."
 msgstr ""
+"Esta vista es usada por los contables para registrar apuntes masivamente en "
+"OpenERP. Si quiere registrar una factura de proveedor, comience "
+"introduciendo el apunte de la cuenta de gastos. OpenERP le propondrá "
+"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a pagar\" "
+"de contrapartida."
 
 #. module: account
 #: help:res.company,property_reserve_and_surplus_account:0
@@ -7062,6 +7141,12 @@ msgid ""
 "Situation' to be used at the time of new fiscal year creation or end of year "
 "entries generation."
 msgstr ""
+"Seleccione 'Ventas' para el diario de ventas que será usado cuando se creen "
+"facturas. Seleccione 'Compras' para el diario a usar cuando se aprueben "
+"pedidos de compra. Seleccione 'Efectivo' (Caja) para que se use a la hora de "
+"hacer pagos. Seleccione 'General' para operaciones misceláneas. Seleccione "
+"'Situación apertura/cierre' para usarlo cuando se crea un nuevo ejercicio "
+"fiscal o la generación del asiento de cierre."
 
 #. module: account
 #: report:account.invoice:0
@@ -7750,6 +7835,13 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Este menú imprime una declaración de IVA basada en facturas o pagos. Puede "
+"seleccionar uno o varios periodos del ejercicio fiscal. La información "
+"necesaria para la declaración de impuestos es generada por OpenERP a partir "
+"de las facturas (o pagos, en algunos países). Esta información se actualiza "
+"en tiempo real; lo cual es muy útil porque le permite previsualizar en "
+"cualquier momento los impuestos a pagar al principio y al final del mes o "
+"trimestre."
 
 #. module: account
 #: report:account.invoice:0
@@ -7819,6 +7911,10 @@ msgid ""
 "of it. You can easily generate refunds and reconcile them from the invoice "
 "form."
 msgstr ""
+"Este menú le permite gestionar notas de crédito (reembolsos) emitidas/a "
+"emitir a sus clientes. Una factura rectificativa es un documento que anula "
+"una factura o parte de ella. Puede generar reembolsos fácilmente y "
+"reconciliarlos desde el formulario de factura."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -7851,7 +7947,7 @@ msgstr "No se puede crear asiento factura en el diario centralizado"
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "Categoría Balance / PyG"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8250,9 +8346,9 @@ msgstr "Tipo de referencia"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 "Esta cuenta se utiliza para transferir las Pérdidas/Ganancias (si es una "
 "Ganancia: Importe será añadido, Pérdida: Importe será deducido), que se "
@@ -8395,6 +8491,10 @@ msgid ""
 "depending on the country and sometimes industry sector. OpenERP allows you "
 "to define and manage them from this menu."
 msgstr ""
+"Un código de impuesto es una referencia al tipo impositivo a aplicar sobre "
+"la base imponible (o descontar sobre el bruto) dependiente del país y a "
+"veces del sector industrial. OpenERP le permite definirlos y gestionarlos "
+"desde este menú."
 
 #. module: account
 #: report:account.overdue:0
@@ -8416,13 +8516,19 @@ msgid ""
 "accounts of a company are required by law to disclose a certain amount of "
 "information. They have to be certified by an external auditor yearly."
 msgstr ""
+"Cree y gestione las cuentas que necesite para registrar los asientos "
+"financieros. Las cuentas son registros de su compañía para apuntar todas las "
+"transacciones financieras. Las compañías resumen sus cuentas anuales en dos "
+"informes principales: el balance y el informe de pérdidas y ganancias. "
+"Habitualmente la presentación de las cuentas anuales es una exigencia legal, "
+"y en algunos países deben ser certificadas anualmente por un auditor externo."
 
 #. module: account
 #: code:addons/account/account.py:0
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "SCNJ"
-msgstr ""
+msgstr "AVENTA"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8441,6 +8547,10 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Establece la vista usada cuando se escriben o consultan apuntes en este "
+"diario. La vista le dice a OpenERP qué campos deben ser visibles, requeridos "
+"o de sólo lectura, y en qué orden. Puede crear su propia vista en cada "
+"diario para introducir apuntes más rápido."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -8669,6 +8779,12 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
+"Esta vista es usada por los contables para registrar apuntes masivamente en "
+"OpenERP. Si quiere registrar una factura de cliente, seleccione el diario y "
+"el periodo en la barra de herramientas de búsqueda. Luego, comience "
+"introduciendo el apunte de la cuenta de ingresos. OpenERP le propondrá "
+"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a cobrar\" "
+"de contrapartida."
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
@@ -8990,6 +9106,10 @@ msgid ""
 "Make sure you have configured Payment Term properly !\n"
 "It should contain atleast one Payment Term Line with type \"Balance\" !"
 msgstr ""
+"¡ No se puede confirmar un asiento descuadrado !\n"
+"¡ Asegúrese de haber configurado el plazo de pago correctamente !\n"
+"¡ Debería contener al menos una línea de plazo de pago con de tipo \"Saldo\" "
+"!"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -9669,7 +9789,7 @@ msgstr "Imprimir diarios analíticos"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Cuenta fin."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 49657cf5fbb..4dc0a67d9c6 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-12-24 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7937,9 +7937,9 @@ msgstr "Tipo de referencia"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 94628420609..1172cbd60ef 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.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-12-24 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8249,13 +8249,10 @@ msgstr "Tipo de referencia"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -11819,6 +11816,15 @@ msgstr "You cannot remove an account which has account entries!. "
 #~ "    def create_entries(self, cr, uid, ids, context=None):\n"
 #~ "        account_model_obj = self.pool.get('account.model"
 
+#~ msgid ""
+#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
+#~ "& Loss Report"
+#~ msgstr ""
+#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
+#~ "& Loss Report"
+
 #~ msgid "Liability View"
 #~ msgstr "Vista de Pasivo"
 
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 46cee533cf1..4058dc98bf6 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-12-24 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr "Viite tüüp"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index 4dec16e476d..93332441b01 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 5273f442a5d..f7345a59754 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-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index 045fb9f9043..380b83a4326 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-12-24 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7907,9 +7907,9 @@ msgstr "Viitetyyppi"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 6afcd78f4f9..edf26144e40 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-12-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8353,9 +8353,9 @@ msgstr "Type de référence"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 3396039cb70..d80eb5e46fc 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-12-24 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index eea4bae7672..bcc84d5d800 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-12-24 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index a7ac09a554b..179c2e1d777 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index 664960b54ee..db6ece7f8b6 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/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-12-24 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7844,9 +7844,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 76ae9e0364c..4b8a8f007c4 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-12-24 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7872,9 +7872,9 @@ msgstr "Tip veze"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 449317241bb..60d932be557 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-25 18:32+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 20:26+0000\n"
+"Last-Translator: NOVOTRADE SYSTEMHOUSE <openerp@novotrade.hu>\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-12-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -4575,7 +4575,7 @@ msgstr ""
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr "Adó számla"
+msgstr "Adószámla"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -4678,7 +4678,7 @@ msgstr ""
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Gyermekek utáni adó"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -6965,6 +6965,9 @@ msgid ""
 "positive, it gives the day of the next month. Set 0 for net days (otherwise "
 "it's based on the beginning of the month)."
 msgstr ""
+"Hónap napja, állíts -1 -et az utolsó napnak az aktuális hónapban. Ha ez "
+"pozitív, akkor megadja a következő hónap napját. Állíts 0 -t netto napoknak "
+"(máskülönben a hónap eleje  alapján lesz meghatározva )"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@@ -7109,7 +7112,7 @@ msgstr ""
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr ""
+msgstr "Használt adó"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -7846,9 +7849,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index e3bcae130db..50ef835d67b 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-12-24 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7847,9 +7847,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index ff0ea963e5c..6957f6c6768 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:22+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 07:54+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8139,9 +8139,9 @@ msgstr "Tipo riferimento"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 8d67f4b3d7a..5ba12ec7af7 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-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index d1bf19a61a0..d1949cd6e3c 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-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 50f80d73e7f..bd097563434 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-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7886,9 +7886,9 @@ msgstr "Nuorodos tipas"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index 16bcd197789..f3fc8690527 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-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7855,9 +7855,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 54dc22b52c8..f30185907e6 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-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8039,9 +8039,9 @@ msgstr "Дугаарлалтын төрөл"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 2732bce797f..96abe8aec24 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-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 15c20b21faa..16dbefd36c5 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-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7968,9 +7968,9 @@ msgstr "Referentietype"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 0b4bed67680..bf40cfe5975 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-12-24 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7874,9 +7874,9 @@ msgstr "Referentietype"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 1328a58c123..52681a5c75f 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-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 35ecc100775..c95ec989c5c 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-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7970,9 +7970,9 @@ msgstr "Typ odnośnika"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 7d6a4c7be37..b9a96aa1b9d 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-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7985,9 +7985,9 @@ msgstr "Tipo de referência"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 0c2d1a1c10a..9ef76060f0a 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-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7938,9 +7938,9 @@ msgstr "Tipo de referência"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 53b52beeadc..2a6e49c1f1a 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-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7919,9 +7919,9 @@ msgstr "Tipul referinţei"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index e1a02db74ea..ea2c50929a8 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 14:14+0000\n"
+"PO-Revision-Date: 2010-12-28 14:42+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -3828,7 +3828,7 @@ msgstr "Счет расходов не определен для этого то
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr "Настройки бух. учета для заказчика"
+msgstr "Настройки бухучета для заказчика"
 
 #. module: account
 #: field:account.invoice.tax,name:0
@@ -4741,7 +4741,7 @@ msgstr ""
 #. module: account
 #: report:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr "Имя счета/контрагента"
+msgstr "Название  счета/партнера"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7645,7 +7645,7 @@ msgstr "Разрешенные типы счетов (оставьте пуст�
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr "Настройки бухгалтерского учета для контрагента-поставщика"
+msgstr "Настройки бухучета для поставщика"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -7897,9 +7897,9 @@ msgstr "Тип ссылки"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 66d10b88dcd..fe3a33a6a66 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-12-24 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 36f9e6996a5..8c5f78a04ed 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-12-24 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7846,9 +7846,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index 258d3a34aa6..97d3a69e52e 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-12-24 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7864,9 +7864,9 @@ msgstr "Vrsta sklica"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index f526b5d2001..e1aba62b2bd 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-12-24 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7859,9 +7859,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 537b766df88..a1450282190 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-12-24 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7901,9 +7901,9 @@ msgstr "Tip reference"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index b2b9311761b..d760cb8e40c 100644
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-25 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7901,9 +7901,9 @@ msgstr "Tip reference"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index d3886397fac..de1ce0ba607 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-12-24 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7946,9 +7946,9 @@ msgstr "Referenstyp"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index e5463309759..848c0398d10 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 1c6fe2fe410..8739b0bd292 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-12-24 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 4f979ec950e..cbe7921a871 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-12-24 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 25439ff75e2..1f525bd463a 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-12-24 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7842,9 +7842,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 5ca2976f566..1e980932b85 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-02 07:52+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 19:06+0000\n"
+"Last-Translator: François Degrave (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-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8115,13 +8115,13 @@ msgstr "Referans Tipi"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index 9745095677e..e542713e728 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 0db0ccdc2ee..9389b56fecd 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-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7848,9 +7848,9 @@ msgstr "Тип посилання"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index c339c35cae6..b4a5442ac87 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 14:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 20:26+0000\n"
+"Last-Translator: François Degrave (OpenERP) <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2428,7 +2428,7 @@ msgstr ""
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể tạo ra loại đệ quy."
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -4112,7 +4112,7 @@ msgstr "Account Journal Select"
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "In hóa đơn"
 
 #. module: account
 #: view:account.tax.template:0
@@ -8238,13 +8238,13 @@ msgstr "Lọai tham chiếu"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index c5ca498c97e..8ffa9ee557d 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-12-25 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7849,9 +7849,9 @@ msgstr "关联类型"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index faf37a69d55..10611a2ec06 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-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index da7e9f7e4a4..e7e047b0940 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-12-24 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7842,9 +7842,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 4a0f3255d96..70fcab91cb1 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -95,7 +95,7 @@ class account_installer(osv.osv_memory):
         'bank_accounts_id': _get_default_accounts,
         'charts': _get_default_charts
     }
-    
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         configured_cmp = []
@@ -106,11 +106,12 @@ class account_installer(osv.osv_memory):
         cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
         configured_cmp = [r[0] for r in cr.fetchall()]
         unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
-        if unconfigured_cmp:
-            cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
-            for field in res['fields']:
-               if field == 'company_id':
-                   res['fields'][field]['domain'] = unconfigured_cmp
+        for field in res['fields']:
+           if field == 'company_id':
+               res['fields'][field]['domain'] = unconfigured_cmp
+               res['fields'][field]['selection'] = [('', '')]
+               if unconfigured_cmp:
+                   cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
                    res['fields'][field]['selection'] = cmp_select
         return res
 
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index abf3eceacfd..f094e1c5f3b 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -95,7 +95,7 @@ class account_invoice(osv.osv):
         cur_obj = self.pool.get('res.currency')
         data_inv = self.browse(cr, uid, ids, context=context)
         for inv in data_inv:
-            if inv.reconciled: 
+            if inv.reconciled:
                 res[inv.id] = 0.0
                 continue
             inv_total = inv.amount_total
@@ -111,7 +111,7 @@ class account_invoice(osv.osv):
                    amount_in_invoice_currency = cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id,abs(lines.debit-lines.credit),round=False,context=context_unreconciled)
                    inv_total -= amount_in_invoice_currency
 
-            result = inv_total 
+            result = inv_total
             res[inv.id] =  self.pool.get('res.currency').round(cr, uid, inv.currency_id, result)
         return res
 
@@ -246,7 +246,7 @@ class account_invoice(osv.osv):
         'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
 
-        'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, help="Link to the automatically generated Journal Items."),
+        'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."),
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Untaxed',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
@@ -947,22 +947,22 @@ class account_invoice(osv.osv):
     def line_get_convert(self, cr, uid, x, part, date, context=None):
         return {
             'date_maturity': x.get('date_maturity', False),
-            'partner_id':part,
-            'name':x['name'][:64],
+            'partner_id': part,
+            'name': x['name'][:64],
             'date': date,
-            'debit':x['price']>0 and x['price'],
-            'credit':x['price']<0 and -x['price'],
-            'account_id':x['account_id'],
-            'analytic_lines':x.get('analytic_lines', []),
-            'amount_currency':x['price']>0 and abs(x.get('amount_currency', False)) or -abs(x.get('amount_currency', False)),
-            'currency_id':x.get('currency_id', False),
+            'debit': x['price']>0 and x['price'],
+            'credit': x['price']<0 and -x['price'],
+            'account_id': x['account_id'],
+            'analytic_lines': x.get('analytic_lines', []),
+            'amount_currency': x['price']>0 and abs(x.get('amount_currency', False)) or -abs(x.get('amount_currency', False)),
+            'currency_id': x.get('currency_id', False),
             'tax_code_id': x.get('tax_code_id', False),
             'tax_amount': x.get('tax_amount', False),
-            'ref':x.get('ref',False),
-            'quantity':x.get('quantity',1.00),
-            'product_id':x.get('product_id', False),
-            'product_uom_id':x.get('uos_id',False),
-            'analytic_account_id':x.get('account_analytic_id',False),
+            'ref': x.get('ref', False),
+            'quantity': x.get('quantity',1.00),
+            'product_id': x.get('product_id', False),
+            'product_uom_id': x.get('uos_id', False),
+            'analytic_account_id': x.get('account_analytic_id', False),
         }
 
     def action_number(self, cr, uid, ids, context=None):
@@ -1132,6 +1132,7 @@ class account_invoice(osv.osv):
                 invoice[field] = invoice[field] and invoice[field][0]
             # create the new invoice
             new_ids.append(self.create(cr, uid, invoice))
+
         return new_ids
 
     def pay_and_reconcile(self, cr, uid, ids, pay_amount, pay_account_id, period_id, pay_journal_id, writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context=None, name=''):
@@ -1232,6 +1233,7 @@ class account_invoice(osv.osv):
         # Update the stored value (fields.function), so we write to trigger recompute
         self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
         return True
+
 account_invoice()
 
 class account_invoice_line(osv.osv):
@@ -1643,6 +1645,7 @@ class account_invoice_tax(osv.osv):
                 'tax_amount': t['tax_amount']
             })
         return res
+
 account_invoice_tax()
 
 
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index 9574cc416a9..764bedeb2b3 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -24,6 +24,7 @@ from osv import osv
 
 class account_analytic_journal(osv.osv):
     _name = 'account.analytic.journal'
+    _description = 'Analytic Journal'
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True),
         'code': fields.char('Journal Code', size=8),
@@ -49,4 +50,4 @@ class account_journal(osv.osv):
 
 account_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/project_report.xml b/addons/account/project/project_report.xml
index dcfdd52a771..3ee449e01b5 100644
--- a/addons/account/project/project_report.xml
+++ b/addons/account/project/project_report.xml
@@ -1,15 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False" id="analytic_journal_print" menu="False" model="account.analytic.journal" name="account.analytic.account.journal" rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
+        <report auto="False" id="analytic_journal_print" menu="False"
+            model="account.analytic.journal" name="account.analytic.account.journal"
+            rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
 
-        <report auto="False" id="account_analytic_account_balance" menu="False" model="account.analytic.account" name="account.analytic.account.balance" rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
+        <report auto="False" id="account_analytic_account_balance" menu="False"
+            model="account.analytic.account" name="account.analytic.account.balance"
+            rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
 
-        <report auto="False" id="account_analytic_account_inverted_balance" menu="False" model="account.analytic.account" name="account.analytic.account.inverted.balance" rml="account/project/report/inverted_analytic_balance.rml" string="Inverted Analytic Balance"/>
+        <report auto="False" id="account_analytic_account_inverted_balance"
+            menu="False" model="account.analytic.account"
+            name="account.analytic.account.inverted.balance"
+            rml="account/project/report/inverted_analytic_balance.rml"
+            string="Inverted Analytic Balance"/>
 
-        <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
+        <report auto="False" id="account_analytic_account_cost_ledger" menu="False"
+            model="account.analytic.account" name="account.analytic.account.cost_ledger"
+            rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
 
-        <report auto="False" id="account_analytic_account_quantity_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger" rml="account/project/report/quantity_cost_ledger.rml" string="Cost Ledger (Only quantities)"/>
+        <report auto="False" id="account_analytic_account_quantity_cost_ledger" 
+            menu="False" model="account.analytic.account" 
+            name="account.analytic.account.quantity_cost_ledger" 
+            rml="account/project/report/quantity_cost_ledger.rml" 
+            string="Cost Ledger (Only quantities)"/>
 
     </data>
 </openerp>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e0a2b18756b..789c76addcf 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -82,12 +82,13 @@
                         <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
                         <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
-                        <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
+                        <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                         <field name="type" select="2"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Account Data">
                             <field name="partner_id" select="1"/>
+                            <field name="currency_id" select="1"/>
                             <newline/>
                             <field name="date_start"/>
                             <field name="date" select="2"/>
@@ -112,7 +113,9 @@
             <field name="view_id" ref="view_account_analytic_account_tree"/>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
-        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="analytic.group_analytic_accounting,group_account_manager"/>
+        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account"
+            parent="menu_analytic_accounting"
+            groups="analytic.group_analytic_accounting"/>
 
         <record id="act_account_renew_view" model="ir.actions.act_window">
             <field name="name">Accounts to Renew</field>
@@ -133,7 +136,9 @@
             <field name="help">The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account.</field>
         </record>
 
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
+        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40" 
+            name="Analytic" parent="account.menu_finance_generic_reporting"
+            sequence="4"/>
 
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
@@ -340,7 +345,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_analytic_journal_search" />
         </record>
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
+        <menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
 
         #
         # Open journal entries
@@ -352,7 +357,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_open_form"
+            id="account_analytic_journal_entries"
+            parent="menu_finance_entries"/>
 
         #
         # Reporting
@@ -364,7 +372,9 @@
             <field name="view_type">tree</field>
             <field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
         </record>
-        <menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_tree" 
+            id="account_analytic_journal_print" parent="account.next_id_40"/>
 
         #
         # Statistics
diff --git a/addons/account/project/wizard/account_analytic_chart_view.xml b/addons/account/project/wizard/account_analytic_chart_view.xml
index f7391dcf86f..e4c13a07601 100644
--- a/addons/account/project/wizard/account_analytic_chart_view.xml
+++ b/addons/account/project/wizard/account_analytic_chart_view.xml
@@ -39,7 +39,7 @@
             action="action_account_analytic_chart"
             id="menu_action_analytic_account_tree2"
             icon="STOCK_INDENT"
-            groups="analytic.group_analytic_accounting,group_account_manager,group_account_user"/>
+            groups="analytic.group_analytic_accounting"/>
 
     </data>
 </openerp>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index d99cad9535e..a9b781d21a9 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -100,7 +100,7 @@
 
     <menuitem action="action_analytic_entries_report"
         id="menu_action_analytic_entries_report"
-        groups="analytic.group_analytic_accounting,group_account_manager"
+        groups="analytic.group_analytic_accounting"
         parent="account.menu_finance_statistic_report_statement" sequence="4"/>
 
 </data>
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 45d7e107180..00fa1f58ff6 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -70,6 +70,9 @@ class account_balance(report_sxw.rml_parse, common_report_header):
     def lines(self, form, ids=[], done=None):#, level=1):
         def _process_child(accounts, disp_acc, parent):
                 account_rec = [acct for acct in accounts if acct['id']==parent][0]
+                currency_obj = self.pool.get('res.currency')
+                acc_id = self.pool.get('account.account').browse(self.cr, self.uid, account_rec['id'])
+                currency = acc_id.currency_id and acc_id.currency_id or acc_id.company_id.currency_id
                 res = {
                     'id': account_rec['id'],
                     'type': account_rec['type'],
@@ -84,12 +87,11 @@ class account_balance(report_sxw.rml_parse, common_report_header):
                 }
                 self.sum_debit += account_rec['debit']
                 self.sum_credit += account_rec['credit']
-                acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
                 if disp_acc == 'bal_movement':
-                    if round(res['credit'], acc_digit) > 0  or round(res['debit'], acc_digit) > 0 or round(res['balance'], acc_digit) != 0:
+                    if currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['balance']) != 0:
                         self.result_acc.append(res)
                 elif disp_acc == 'bal_solde':
-                    if round(res['balance'], acc_digit) != 0:
+                    if currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) != 0:
                         self.result_acc.append(res)
                 else:
                     self.result_acc.append(res)
diff --git a/addons/account/report/account_balance_landscape_old_backup.rml b/addons/account/report/account_balance_landscape_old_backup.rml
index 6790082f8dd..6790082f8dd 100755..100644
--- a/addons/account/report/account_balance_landscape_old_backup.rml
+++ b/addons/account/report/account_balance_landscape_old_backup.rml
diff --git a/addons/account/report/account_balance_old_backup.rml b/addons/account/report/account_balance_old_backup.rml
index cf67cb6bc3d..cf67cb6bc3d 100755..100644
--- a/addons/account/report/account_balance_old_backup.rml
+++ b/addons/account/report/account_balance_old_backup.rml
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 8816d702118..8762b44e1e2 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -89,6 +89,7 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
         self.res_bl = self.obj_pl.final_result()
 
         account_pool = db_pool.get('account.account')
+        currency_pool = db_pool.get('res.currency')
 
         types = [
             'liability',
@@ -136,16 +137,16 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
                         'level': account.level,
                         'balance':account.balance,
                     }
-                    acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
+                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
                     if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_dr += account.balance
                     if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += account.balance
                     if data['form']['display_account'] == 'bal_movement':
-                        if round(account.credit, acc_digit) > 0  or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                             accounts_temp.append(account_dict)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                             accounts_temp.append(account_dict)
                     else:
                         accounts_temp.append(account_dict)
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index ae47873a294..d3da592e085 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -341,7 +341,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table13">
+    <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Chart of Account</para>
@@ -356,14 +356,11 @@
           <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Partner's</para>
-        </td>
-        <td>
           <para style="terp_tblheader_General_Centre">Target Moves</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1">
+    <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
@@ -421,9 +418,6 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
-        </td>
-        <td>
           <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
         </td>
       </tr>
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 125edb0d992..e8da59bb165 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -36,7 +36,7 @@ class account_invoice_report(osv.osv):
             ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
-        'uom_name': fields.char('Default UoM', size=128, readonly=True),
+        'uom_name': fields.char('Reference UoM', size=128, readonly=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
@@ -88,7 +88,11 @@ class account_invoice_report(osv.osv):
                     ai.partner_id as partner_id,
                     ai.payment_term as payment_term,
                     ai.period_id as period_id,
-                    u.name as uom_name,
+                    (case when u.uom_type not in ('reference') then
+                        (select name from product_uom where uom_type='reference' and category_id=u.category_id)
+                    else
+                        u.name
+                    end) as uom_name,
                     ai.currency_id as currency_id,
                     ai.journal_id as journal_id,
                     ai.fiscal_position as fiscal_position,
@@ -104,9 +108,9 @@ class account_invoice_report(osv.osv):
                     ai.account_id as account_id,
                     ai.partner_bank_id as partner_bank_id,
                     sum(case when ai.type in ('out_refund','in_invoice') then
-                         ail.quantity * u.factor * -1
+                         ail.quantity / u.factor * -1
                         else
-                         ail.quantity * u.factor
+                         ail.quantity / u.factor
                         end) as product_qty,
                     sum(case when ai.type in ('out_refund','in_invoice') then
                          ail.quantity*ail.price_unit * -1
@@ -125,9 +129,9 @@ class account_invoice_report(osv.osv):
                     else
                       sum(ail.quantity*ail.price_unit)
                     end)/(case when ai.type in ('out_refund','in_invoice') then
-                      sum(ail.quantity*u.factor*-1)
+                      sum(ail.quantity/u.factor*-1)
                     else
-                      sum(ail.quantity*u.factor)
+                      sum(ail.quantity/u.factor)
                     end) / cr.rate as price_average,
                     cr.rate as currency_rate,
                     sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
@@ -179,7 +183,9 @@ class account_invoice_report(osv.osv):
                     ai.account_id,
                     ai.partner_bank_id,
                     ai.residual,
-                    ai.amount_total
+                    ai.amount_total,
+                    u.uom_type,
+                    u.category_id
             )
         """)
 
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index d9d6226904a..c17d2e7b23e 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -82,6 +82,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
         db_pool = pooler.get_pool(self.cr.dbname)
 
         account_pool = db_pool.get('account.account')
+        currency_pool = db_pool.get('res.currency')
 
         types = [
             'expense',
@@ -106,16 +107,16 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
             accounts_temp = []
             for account in accounts:
                 if (account.user_type.report_type) and (account.user_type.report_type == typ):
-                    acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
+                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
                     if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_dr += abs(account.debit - account.credit)
                     if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += abs(account.debit - account.credit)
                     if data['form']['display_account'] == 'bal_movement':
-                        if round(account.credit, acc_digit) > 0  or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                             accounts_temp.append(account)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if round(account.balance, acc_digit) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
                             accounts_temp.append(account)
                     else:
                         accounts_temp.append(account)
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index b7775c48c8d..fe98ef7a403 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -31,7 +31,7 @@
 "access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
-"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
+"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,1,1,1
 "access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
 "access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
@@ -69,8 +69,8 @@
 "access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
 "access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
 "access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
-"access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
-"access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
+"access_account_account_sale_manager","account.account sale manager","model_account_account","base.group_sale_manager",1,0,0,0
+"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_manager",1,0,0,0
 "access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
 "access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
 "access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
@@ -97,6 +97,7 @@
 "access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
 "access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
+"access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1
@@ -116,5 +117,8 @@
 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
 "access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
+"access_account_tax_sale_manager","account.tax sale manager","model_account_tax","base.group_sale_salesman",1,0,0,0
+"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_salesman",1,0,0,0
+"access_account_invoice_tax_sale_manager","account.invoice.tax  sale manager","model_account_invoice_tax","base.group_sale_salesman",1,0,0,0
 "access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0
 "access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 90ecdb9b191..a18adaa0320 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -52,7 +52,7 @@
             action="action_account_automatic_reconcile"
             id="menu_automatic_reconcile"
             parent="periodical_processing_reconciliation"
-            groups="base.group_extended,group_account_manager,group_account_user"/>
+            groups="base.group_extended"/>
 
         <record id="account_automatic_reconcile_view1" model="ir.ui.view">
              <field name="name">Automatic reconcile unreconcile</field>
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 2c10f83eee4..cf16321679f 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -92,12 +92,14 @@ class account_move_journal(osv.osv_memory):
         journal = False
         if journal_id:
             journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
+            journal_string = _("Journal: %s") % tools.ustr(journal)
         else:
-            journal = "All"
+            journal_string = _("Journal: All")
 
         period = False
         if period_id:
             period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
+            period_string = _("Period: %s") % tools.ustr(period)
 
         view = """<?xml version="1.0" encoding="utf-8"?>
         <form string="Standard entries">
@@ -105,16 +107,16 @@ class account_move_journal(osv.osv_memory):
             <field name="target_move" />
             <newline/>
             <group colspan="4" >
-                <label width="300" string="Journal: %s"/>
+                <label width="300" string="%s"/>
                 <newline/>
-                <label width="300" string="Period:  %s"/>
+                <label width="300" string="%s"/>
             </group>
             <group colspan="4" col="4">
                 <label string ="" colspan="2"/>
                 <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 <button icon="terp-gtk-go-back-rtl" string="Open" name="action_open_window" default_focus="1" type="object"/>
             </group>
-        </form>""" % (tools.ustr(journal), tools.ustr(period))
+        </form>""" % (journal_string, period_string)
 
         view = etree.fromstring(view.encode('utf8'))
         xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
@@ -190,4 +192,4 @@ class account_move_journal(osv.osv_memory):
 
 account_move_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index 12ab0236759..4a2f40ec708 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -63,7 +63,7 @@ class account_move_line_select(osv.osv_memory):
         if context['active_id']:
             acc_data = account_obj.browse(cr, uid, context['active_id']).child_consol_ids
             if acc_data:
-                result['context'].update({'consolidate_childs': True})
+                result['context'].update({'consolidate_children': True})
         result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
         return result
 
diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index 6b8c4371dd2..a72d58dd904 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-from lxml import etree
-
 from osv import osv
 
 class account_balance_report(osv.osv_memory):
@@ -32,21 +30,10 @@ class account_balance_report(osv.osv_memory):
         'journal_ids': [],
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
-        res = super(account_balance_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
-
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data}
 
 account_balance_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index 9438a6f9216..38f456f7d15 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -10,6 +10,9 @@
           <field name="inherit_id" ref="account_common_report_view" />
           <field name="arch" type="xml">
             <data>
+            <xpath expr="//field[@name='journal_ids']" position="replace">
+                <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
+            </xpath>
             <xpath expr="/form/label[@string='']" position="replace">
                 <separator string="Trial Balance" colspan="4"/>
                 <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index 5eb1f0f5a2e..40d798a9964 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -22,8 +22,6 @@
 import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-from lxml import etree
-
 from osv import osv, fields
 from tools.translate import _
 
@@ -44,16 +42,6 @@ class account_aged_trial_balance(osv.osv_memory):
         'direction_selection': 'past',
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(account_aged_trial_balance, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('invisible', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
-
     def _print_report(self, cr, uid, ids, data, context=None):
         res = {}
         if context is None:
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index aea2fba2528..195ccbef111 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -20,7 +20,7 @@
                     <newline/>
                     <field name="result_selection"/>
                     <field name="direction_selection"/>
-                    <field name="journal_ids"/>
+                    <field name="journal_ids" required="0" invisible="1"/>
                     <newline/>
                     <separator colspan="4"/>
                     <group col="4" colspan="4">
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index 6ce36242f47..b69c6d65d71 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-from lxml import etree
-
 from osv import osv, fields
 from tools.translate import _
 
@@ -32,36 +30,45 @@ class account_bs_report(osv.osv_memory):
     _inherit = "account.common.account.report"
     _description = 'Account Balance Sheet Report'
 
+    def _get_def_reserve_account(self, cr, uid, context=None):
+        chart_id = self._get_account(cr, uid, context=context)
+        res = self.onchange_chart_id(cr, uid, [], chart_id, context=context)
+        if not res:
+            return False
+        return res['value']['reserve_account_id']
+
     _columns = {
         'display_type': fields.boolean("Landscape Mode"),
-        'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',required = True,
-                                      help='This Account is used for trasfering Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
+        'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',
+                                      required=True,
+                                      help='This Account is used for transfering Profit/Loss ' \
+                                           '(Profit: Amount will be added, Loss: Amount will be duducted), ' \
+                                           'which is calculated from Profilt & Loss Report',
+                                      domain = [('type','=','payable')]),
     }
 
     _defaults={
         'display_type': True,
         'journal_ids': [],
+        'reserve_account_id': _get_def_reserve_account,
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(account_bs_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
+    def onchange_chart_id(self, cr, uid, ids, chart_id, context=None):
+        if not chart_id:
+            return {}
+        account = self.pool.get('account.account').browse(cr, uid, chart_id , context=context)
+        if not account.company_id.property_reserve_and_surplus_account:
+            return {'value': {'reserve_account_id': False}}
+        return {'value': {'reserve_account_id': account.company_id.property_reserve_and_surplus_account.id}}
+
 
     def _print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
-        data = self.pre_print_report(cr, uid, ids, data, context=context)
-        account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id'], context=context)
-        if not account.company_id.property_reserve_and_surplus_account:
+        data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])
+        if not data['form']['reserve_account_id']:
             raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
-        data['form']['reserve_account_id'] = account.company_id.property_reserve_and_surplus_account.id
-        data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
+        data = self.pre_print_report(cr, uid, ids, data, context=context)
         if data['form']['display_type']:
             return {
                 'type': 'ir.actions.report.xml',
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index 97b73784f43..22a6e0608b2 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -9,14 +9,20 @@
             <field name="inherit_id" ref="account.account_common_report_view" />
             <field name="arch" type="xml">
             <data>
+            <xpath expr="//field[@name='chart_account_id']" position="replace">
+                <field name="chart_account_id" widget="selection" on_change="onchange_chart_id(chart_account_id)"/>
+            </xpath>
+            <xpath expr="//field[@name='journal_ids']" position="replace">
+                <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
+            </xpath>
             <xpath expr="/form/label[@string='']" position="replace">
                 <separator string="Balance Sheet" colspan="4"/>
                 <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
             </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="display_account"/>
+                <field name="reserve_account_id" required="1"/>
                 <field name="display_type"/>
-                <field name="reserve_account_id" required="0" invisible="1"/>
                 <newline/>
             </xpath>
             </data>
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index eeb77f708e0..a4f87f55da8 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -86,7 +86,7 @@ class account_common_report(osv.osv_memory):
         return res
 
     def _get_account(self, cr, uid, context=None):
-        accounts = self.pool.get('account.account').search(cr, uid, [], limit=1)
+        accounts = self.pool.get('account.account').search(cr, uid, [('parent_id', '=', False)], limit=1)
         return accounts and accounts[0] or False
 
     def _get_fiscalyear(self, cr, uid, context=None):
diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
index 94487c4f567..c526550e789 100644
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-from lxml import etree
-
 from osv import osv, fields
 
 class account_pl_report(osv.osv_memory):
@@ -40,21 +38,6 @@ class account_pl_report(osv.osv_memory):
         'target_move': False
     }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        mod_obj = self.pool.get('ir.model.data')
-        res = super(account_pl_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        doc = etree.XML(res['arch'])
-        nodes = doc.xpath("//field[@name='journal_ids']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        nodes = doc.xpath("//field[@name='target_move']")
-        for node in nodes:
-            node.set('readonly', '1')
-            node.set('required', '0')
-        res['arch'] = etree.tostring(doc)
-        return res
-
     def _print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
@@ -75,4 +58,4 @@ class account_pl_report(osv.osv_memory):
 
 account_pl_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_profit_loss_view.xml b/addons/account/wizard/account_report_profit_loss_view.xml
index be0ced5c787..d9876f57454 100644
--- a/addons/account/wizard/account_report_profit_loss_view.xml
+++ b/addons/account/wizard/account_report_profit_loss_view.xml
@@ -9,6 +9,12 @@
             <field name="inherit_id" ref="account.account_common_report_view" />
             <field name="arch" type="xml">
             <data>
+            <xpath expr="//field[@name='target_move']" position="replace">
+                <field name="target_move" required="0" readonly="1"/>
+            </xpath>
+            <xpath expr="//field[@name='journal_ids']" position="replace">
+                <field name="journal_ids" required="0" colspan="4" nolabel="1" readonly="1"/>
+            </xpath>
             <xpath expr="/form/label[@string='']" position="replace">
                 <separator string="Profit And Loss" colspan="4"/>
                 <label nolabel="1" colspan="4" string="The Profit and Loss report gives you an overview of your company profit and loss in a single document"/>
diff --git a/addons/account_accountant/i18n/el.po b/addons/account_accountant/i18n/el.po
index a297e367389..f21e656d0cc 100644
--- a/addons/account_accountant/i18n/el.po
+++ b/addons/account_accountant/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-14 07:49+0000\n"
+"PO-Revision-Date: 2010-12-28 17:22+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
@@ -26,6 +26,11 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Αυτό το άρθωμα δίνει στον Διαχειριστή πρόσβαση σε όλες τις δυνατότητες της "
+"λογιστικής όπως το ημερολόγιο\n"
+"και το Λογιστικό Σχέδιο.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/es_EC.po b/addons/account_accountant/i18n/es_EC.po
index 82f45ddb4c0..e78454ba159 100644
--- a/addons/account_accountant/i18n/es_EC.po
+++ b/addons/account_accountant/i18n/es_EC.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-22 20:40+0000\n"
+"PO-Revision-Date: 2010-12-28 05:07+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
@@ -26,6 +26,11 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo proporciona al usuario admin el acceso a todas las "
+"funcionalidades de contabilidad como\n"
+"los asientos y el plan contable.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 00656771c42..3bc3ba5222a 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -96,7 +96,7 @@
             res_model="account.analytic.default"
             src_model="res.partner"
             context="{'search_default_partner_id': [active_id]}"
-            groups="base.group_extended"/>
+            groups="analytic.group_analytic_accounting"/>
 
         <act_window
             name="Analytic Rules"
@@ -104,7 +104,7 @@
             res_model="account.analytic.default"
             src_model="res.users"
             context="{'search_default_user_id': [active_id]}"
-            groups="base.group_extended"/>
+            groups="analytic.group_analytic_accounting"/>
 
         <act_window
             name="Analytic Rules"
@@ -112,7 +112,7 @@
             id="analytic_rule_action_product"
             src_model="product.product"
             context="{'search_default_product_id': [active_id]}"
-            groups="base.group_extended"/>
+            groups="analytic.group_analytic_accounting"/>
 
     </data>
 </openerp>
diff --git a/addons/account_analytic_default/i18n/el.po b/addons/account_analytic_default/i18n/el.po
index 058690a2dcd..712db87c772 100644
--- a/addons/account_analytic_default/i18n/el.po
+++ b/addons/account_analytic_default/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-14 08:17+0000\n"
+"PO-Revision-Date: 2010-12-28 17:24+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -60,7 +60,7 @@ msgstr "Προκαθορισμένη Ημερομηνία Λήξης γι' αυ�
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Λίστα Παραλαβής"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -89,7 +89,7 @@ msgstr "Προϊόν"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Αναλυτική Κατανομή"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -155,7 +155,7 @@ msgstr "Αλληλουχία"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Γραμμή Τιμολογίου"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -166,7 +166,7 @@ msgstr "Αναλυτικός Λογαριασμός"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr ""
+msgstr "Λογαριασμοί"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index f3cec96bbe1..b25f6994394 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -171,7 +171,7 @@ class account_analytic_plan_instance(osv.osv):
     """% (tools.to_xml(plan_id.name), wiz_id[0])
                 for line in plan_id.plan_ids:
                     res['arch']+="""
-                    <field name="account%d_ids" string="%s" colspan="4">
+                    <field name="account%d_ids" string="%s" nolabel="1" colspan="4">
                     <tree string="%s" editable="bottom">
                         <field name="rate"/>
                         <field name="analytic_account_id" domain="[('parent_id','child_of',[%d])]" groups="base.group_extended"/>
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index 697cb6dca11..dac88f2f5fa 100644
--- a/addons/account_analytic_plans/i18n/el.po
+++ b/addons/account_analytic_plans/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-19 13:31+0000\n"
-"Last-Translator: Kontaxis Panagiotis <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 17:26+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:31+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -139,7 +139,7 @@ msgstr "Λογαριασμος Αναλυτικής"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Ο κωδικός του ημερολογίου πρέπει να είναι μοναδικός ανά εταιρία !"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
@@ -155,7 +155,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Γραμμή Παραγγελίας"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
@@ -502,7 +502,7 @@ msgstr "Κώδικας Διανομής"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -548,7 +548,7 @@ msgstr "Αλληλουχία"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Το όνομα του ημερολογίου πρέπει να είναι μοναδικός ανά εταιρία !"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
diff --git a/addons/account_anglo_saxon/i18n/hi.po b/addons/account_anglo_saxon/i18n/hi.po
index 033a87db618..677193a794f 100644
--- a/addons/account_anglo_saxon/i18n/hi.po
+++ b/addons/account_anglo_saxon/i18n/hi.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 11:14+0000\n"
+"PO-Revision-Date: 2010-12-28 08:00+0000\n"
 "Last-Translator: Sanjay Kumar <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
 msgid " Accounting Property"
-msgstr ""
+msgstr " लेखांकन संपत्ति"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
@@ -56,7 +56,7 @@ msgstr "उत्पाद  प्रारूप"
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
 msgid "Stock Accounting for Anglo Saxon countries"
-msgstr ""
+msgstr "अंग्लो Saxon देशों के लिए भण्डार लेखा"
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
@@ -100,6 +100,7 @@ msgid ""
 "This account will be used to value price difference between purchase price "
 "and cost price."
 msgstr ""
+"इस खाता का उपयोग क्रय मूल्य और विक्रय मूल्य का अंतर निकालने में किया जायेगा"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "संरचना देखने के लिए अमान्य XML!"
diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po
index 172c4fa1c9c..d5c13679c57 100644
--- a/addons/account_anglo_saxon/i18n/it.po
+++ b/addons/account_anglo_saxon/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-21 07:55+0000\n"
+"PO-Revision-Date: 2010-12-28 09:17+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
@@ -30,13 +30,15 @@ msgstr "Categoria prodotto"
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Errore! Non è possibile creare categorie ricorsive"
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Errore: l'unità misura di default e quella di acquisto devono essere nella "
+"stessa categoria."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index a0aab8298dc..c37a93b4be4 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
@@ -29,6 +29,15 @@ class account_invoice_line(osv.osv):
     def move_line_get(self, cr, uid, invoice_id, context=None):
         res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context=context)
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
+        company_currency = inv.company_id.currency_id.id
+        def get_price(cr, uid, inv, company_currency,i_line):
+            cur_obj = self.pool.get('res.currency')
+            if inv.currency_id.id != company_currency:
+                price = cur_obj.compute(cr, uid, company_currency, inv.currency_id.id, i_line.product_id.product_tmpl_id.standard_price * i_line.quantity, context={'date': inv.date_invoice})
+            else:
+                price = i_line.product_id.product_tmpl_id.standard_price * i_line.quantity
+            return price
+
         if inv.type in ('out_invoice','out_refund'):
             for i_line in inv.invoice_line:
                 if i_line.product_id:
@@ -56,7 +65,7 @@ class account_invoice_line(osv.osv):
                             'name': i_line.name[:64],
                             'price_unit':i_line.product_id.product_tmpl_id.standard_price,
                             'quantity':i_line.quantity,
-                            'price':i_line.product_id.product_tmpl_id.standard_price * i_line.quantity,
+                            'price':get_price(cr, uid, inv, company_currency, i_line),
                             'account_id':dacc,
                             'product_id':i_line.product_id.id,
                             'uos_id':i_line.uos_id.id,
@@ -69,7 +78,7 @@ class account_invoice_line(osv.osv):
                             'name': i_line.name[:64],
                             'price_unit':i_line.product_id.product_tmpl_id.standard_price,
                             'quantity':i_line.quantity,
-                            'price': -1 * i_line.product_id.product_tmpl_id.standard_price * i_line.quantity,
+                            'price': -1 * get_price(cr, uid, inv, company_currency, i_line),
                             'account_id':cacc,
                             'product_id':i_line.product_id.id,
                             'uos_id':i_line.uos_id.id,
diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py
index acd6577fbb7..ebb9bde3d00 100644
--- a/addons/account_anglo_saxon/product.py
+++ b/addons/account_anglo_saxon/product.py
@@ -30,7 +30,25 @@ class product_category(osv.osv):
             string="Price Difference Account",
             method=True,
             view_load=True,
-            help="This account will be used to value price difference between purchase price and cost price."),                
+            help="This account will be used to value price difference between purchase price and cost price."),
+
+        #Redefine fields to change help text for anglo saxon methodology.            
+        'property_account_income_categ': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Income Account",
+            method=True,
+            view_load=True,
+            help="This account will be used to value outgoing stock for the current product category using sale price"),
+        'property_account_expense_categ': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Expense Account",
+            method=True,
+            view_load=True,
+            help="This account will be used to value outgoing stock for the current product category using cost price"),                
 
     }
 product_category()
@@ -45,7 +63,25 @@ class product_template(osv.osv):
             string="Price Difference Account",
             method=True,
             view_load=True,
-            help="This account will be used to value price difference between purchase price and cost price."),                
+            help="This account will be used to value price difference between purchase price and cost price."),
+            
+        #Redefine fields to change help text for anglo saxon methodology.
+        'property_account_income': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Income Account",
+            method=True,
+            view_load=True,
+            help="This account will be used to value outgoing stock for the current product category using sale price"),
+        'property_account_expense': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Expense Account",
+            method=True,
+            view_load=True,
+            help="This account will be used to value outgoing stock for the current product category using cost price"),                
 
     }
 product_template()
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 295569f8d86..4d3cbfa225f 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -272,6 +272,9 @@
                                     <field name="date_to"/>
                                     <field name="paid_date"/>
                                     <field name="planned_amount"/>
+                                    <field name="practical_amount" sum="Practical Amount"/>
+                                    <field name="theoritical_amount" sum="Theoritical Amount"/>
+                                    <field name="percentage"/>
                                 </tree>
                                 <form string="Budget Lines">
                                     <field name="crossovered_budget_id"/>
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index 7a4a5fa2c9d..8bb703fe612 100644
--- a/addons/account_budget/i18n/ru.po
+++ b/addons/account_budget/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-08-02 21:08+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 14:57+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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-12-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -214,7 +214,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
-msgstr ""
+msgstr "Теоретическая сумма"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
@@ -252,7 +252,7 @@ msgstr "Напечатано:"
 #: code:addons/account_budget/account_budget.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка !"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
diff --git a/addons/account_cancel/i18n/el.po b/addons/account_cancel/i18n/el.po
index 2e9ec2bc140..97bf7fc72e3 100644
--- a/addons/account_cancel/i18n/el.po
+++ b/addons/account_cancel/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 16:43+0000\n"
+"PO-Revision-Date: 2010-12-28 17:04+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_cancel
@@ -25,6 +25,11 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"    Το άρθρωμα πρσθέτει το πεδίο 'Επιτρέπονται ακυρωτικές εγγραφές' στην "
+"μορφή φόρμας του ημερολογίου του λογαριασμού. Εάν είναι αληθές επιτρέπει τον "
+"χρήστη να ακυρώσει εγγραφές και τιμολόγια.\n"
+"    "
 
 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
diff --git a/addons/account_chart/i18n/el.po b/addons/account_chart/i18n/el.po
index a0fb6b56699..342da5a96f3 100644
--- a/addons/account_chart/i18n/el.po
+++ b/addons/account_chart/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2009-09-08 16:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-28 17:27+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
@@ -25,4 +25,4 @@ msgstr "Αφαιρέστε το ελάχιστο πρότυπο λογιστικ
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
+msgstr "Λογιστικό Σχέδιο"
diff --git a/addons/account_chart/i18n/fr.po b/addons/account_chart/i18n/fr.po
index b13a74a00e9..0321267e53b 100644
--- a/addons/account_chart/i18n/fr.po
+++ b/addons/account_chart/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-17 08:22+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-28 15:44+0000\n"
+"Last-Translator: Aline (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-12-24 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
@@ -25,4 +24,4 @@ msgstr "Supprime le plan de compte minimal"
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
+msgstr "Plan comptable"
diff --git a/addons/account_chart/i18n/it.po b/addons/account_chart/i18n/it.po
index 506bf55bc07..30b45ee044b 100644
--- a/addons/account_chart/i18n/it.po
+++ b/addons/account_chart/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-21 07:55+0000\n"
+"PO-Revision-Date: 2010-12-28 09:17+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
@@ -24,7 +24,7 @@ msgstr "Rimuove il piano dei conti minimale"
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
+msgstr "Piani dei conti"
 
 #~ msgid "The certificate ID of the module must be unique !"
 #~ msgstr "L'ID certificato del modulo deve essere unico!"
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv
index 3ab8dccd4ad..9eb831185d5 100644
--- a/addons/account_coda/security/ir.model.access.csv
+++ b/addons/account_coda/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_account_coda","account.coda","model_account_coda","account.group_account_user",1,0,0,0
 "access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
-"access_account_coda_import_manager","account.coda.import","model_account_coda_import","account.group_account_manager",1,1,1,1
 "access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 9193ace3705..659e802b567 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 08:12+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2010-12-28 15:47+0000\n"
+"Last-Translator: Aline (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-12-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -88,6 +88,10 @@ msgid ""
 "E-Mail sent to following Partners successfully. !\n"
 "\n"
 msgstr ""
+"\n"
+"\n"
+"Courriel envoyé avec succès aux partenaires suivants. !\n"
+"\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -308,7 +312,7 @@ msgstr ""
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr ""
+msgstr "Envoyer un courriel dans la langue du partenaire"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -490,6 +494,8 @@ msgid ""
 "All E-mails have been successfully sent to Partners:.\n"
 "\n"
 msgstr ""
+"Tous les couriels ont bien été envoyés aux partenaires :.\n"
+"\n"
 
 #. module: account_followup
 #: constraint:res.company:0
@@ -584,7 +590,7 @@ msgstr "Lignes de Relances"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
-msgstr ""
+msgstr "Litige"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
@@ -635,6 +641,8 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
+"Ne changez pas ce message si vous voulez envoyer des courriels dans la "
+"langue du partenaire, ou configurez-le à partir des données de la société"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
@@ -719,7 +727,7 @@ msgstr "Séquence"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr ""
+msgstr "%(company_name)s : Nom de la société de l'utilisateur"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 6d6203d3d69..a9bca5d89ae 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -48,6 +48,7 @@
         "voucher_sales_purchase_view.xml",
         "account_voucher_wizard.xml",
         "account_voucher_pay_invoice.xml",
+        "report/account_voucher_sales_receipt_view.xml",
         "security/account_voucher_security.xml"
     ],
     "test" : [
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 0c6ffbb49d3..4e08ad9112b 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -982,7 +982,7 @@ class account_bank_statement_line(osv.osv):
     def _check_amount(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.voucher_id:
-                if not (obj.amount == obj.voucher_id.amount):
+                if not (abs(obj.amount) == obj.voucher_id.amount):
                     return False
         return True
 
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 28dfbaa6676..55bb3315d56 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 19:46+0000\n"
+"PO-Revision-Date: 2010-12-27 09:24+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index 1c25ed67633..3d803d641ef 100644
--- a/addons/account_voucher/i18n/es_EC.po
+++ b/addons/account_voucher/i18n/es_EC.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-10 18:11+0000\n"
+"PO-Revision-Date: 2010-12-28 05:10+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@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-12-24 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -25,7 +25,7 @@ msgstr "Transacciones sin conciliar"
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Ajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -137,7 +137,7 @@ msgstr "Cambiar a borrador"
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Write-Off Comment"
-msgstr ""
+msgstr "Comentario del desajuste"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
@@ -309,6 +309,13 @@ msgid ""
 "\n"
 "* The 'Cancelled' state is used when user cancel voucher."
 msgstr ""
+" * El estado 'Borrador' se utiliza cuando un usuario codifica un recibo "
+"nuevo sin confirmar.\n"
+"* El estado 'Pro-forma' cuando el recibo no tiene un número de recibo.\n"
+"* El estado \"Fijado\" se utiliza cuando el usuario crea el recibo, se "
+"genera un número de recibo y se crean los asientos del recibo en la "
+"contabilidad.\n"
+"* El estado \"Cancelado\" se utiliza cuando el usuario cancela el recibo."
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -354,7 +361,7 @@ msgstr "En cuenta de :"
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "Importe del desajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -469,7 +476,7 @@ msgstr "Monto Pagado"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "Diferencia del pago"
 
 #. module: account_voucher
 #: constraint:account.bank.statement.line:0
@@ -477,6 +484,8 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@@ -604,7 +613,7 @@ msgstr "Monto conciliado"
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "Cuenta analítica del desajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -647,7 +656,7 @@ msgstr "A través de :"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payment"
-msgstr ""
+msgstr "Pago a Proveedor"
 
 #. module: account_voucher
 #: help:account.voucher,reference:0
@@ -768,7 +777,7 @@ msgstr "¿Desea confirmar este registro?"
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile with Write-Off"
-msgstr ""
+msgstr "Conciliar con desajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -837,12 +846,12 @@ msgstr "Cuenta de desajuste"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "Facturas de proveedor y transiciones de salida"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Abrir asientos de proveedor"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice
@@ -863,7 +872,7 @@ msgstr "Fecha de vigencia de asientos contables"
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Keep Open"
-msgstr ""
+msgstr "Mantener abierto"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index 714ea66ec51..3fe66158509 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -7,20 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-24 09:41+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-28 15:51+0000\n"
+"Last-Translator: Aline (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-12-24 05:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Transactions non rapprochées"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
@@ -31,12 +30,12 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr ""
+msgstr "Ref. du paiement"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "Ouvrir les entrées du journal des clients"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -46,23 +45,24 @@ msgstr "Particuliers"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
+"Vous ne pouvez pas supprimer des pièces qui sont encore ouvertes ou payées !"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier"
-msgstr ""
+msgstr "Fournisseur"
 
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print
 msgid "Voucher Print"
-msgstr ""
+msgstr "Imprimer la pièce"
 
 #. module: account_voucher
 #: model:ir.module.module,description:account_voucher.module_meta_information
@@ -80,12 +80,12 @@ msgstr ""
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
 msgid "Bill Payment"
-msgstr ""
+msgstr "Paiement de la note"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
 msgid "Originial Amount"
-msgstr ""
+msgstr "Total originel"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
diff --git a/addons/account_voucher/report/__init__.py b/addons/account_voucher/report/__init__.py
index 010f6446338..caeb155adbe 100644
--- a/addons/account_voucher/report/__init__.py
+++ b/addons/account_voucher/report/__init__.py
@@ -21,5 +21,6 @@
 
 import account_voucher
 import account_voucher_print
+import account_voucher_sales_receipt
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
diff --git a/addons/account_voucher/report/account_voucher.rml b/addons/account_voucher/report/account_voucher.rml
index 61297eb9d7b..61297eb9d7b 100755..100644
--- a/addons/account_voucher/report/account_voucher.rml
+++ b/addons/account_voucher/report/account_voucher.rml
diff --git a/addons/account_voucher/report/account_voucher_print.rml b/addons/account_voucher/report/account_voucher_print.rml
index c4492ec6ed0..c4492ec6ed0 100755..100644
--- a/addons/account_voucher/report/account_voucher_print.rml
+++ b/addons/account_voucher/report/account_voucher_print.rml
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py
new file mode 100644
index 00000000000..06511c9a118
--- /dev/null
+++ b/addons/account_voucher/report/account_voucher_sales_receipt.py
@@ -0,0 +1,131 @@
+##############################################################################
+#
+#    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 fields, osv
+import tools
+
+class sale_receipt_report(osv.osv):
+    _name = "sale.receipt.report"
+    _description = "Sales Receipt Statistics"
+    _auto = False
+    _rec_name = 'date'
+    _columns = {
+        'date': fields.date('Date', readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
+        'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'price_total': fields.float('Total Without Tax', readonly=True),
+        'price_total_tax': fields.float('Total With Tax', readonly=True),
+        'nbr':fields.integer('# of Voucher Lines', readonly=True),
+        'type': fields.selection([
+            ('sale','Sale'),
+            ('purchase','Purchase'),
+            ('payment','Payment'),
+            ('receipt','Receipt'),
+            ],'Type', readonly=True),
+        'state': fields.selection([
+            ('draft','Draft'),
+             ('proforma','Pro-forma'),
+             ('posted','Posted'),
+             ('cancel','Cancelled')
+            ], 'Voucher State', readonly=True),
+        'pay_now':fields.selection([
+            ('pay_now','Pay Directly'),
+            ('pay_later','Pay Later or Group Funds'),
+        ],'Payment', readonly=True),
+        'date_due': fields.date('Due Date', readonly=True),
+        'account_id': fields.many2one('account.account', 'Account',readonly=True),
+        'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
+        'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg")
+    }
+    _order = 'date desc'
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'sale_receipt_report')
+        cr.execute("""
+            create or replace view sale_receipt_report as (
+                select min(avl.id) as id,
+                    av.date as date,
+                    to_char(av.date, 'YYYY') as year,
+                    to_char(av.date, 'MM') as month,
+                    to_char(av.date, 'YYYY-MM-DD') as day,
+                    av.partner_id as partner_id,
+                    av.currency_id as currency_id,
+                    av.journal_id as journal_id,
+                    rp.user_id as user_id,
+                    av.company_id as company_id,
+                    count(avl.*) as nbr,
+                    av.type as type,
+                    av.state,
+                    av.pay_now,
+                    av.date_due as date_due,
+                    av.account_id as account_id,
+                    sum(av.amount-av.tax_amount)/(select count(l.id) from account_voucher_line as l
+                            left join account_voucher as a ON (a.id=l.voucher_id)
+                            where a.id=av.id) as price_total,
+                    sum(av.amount)/(select count(l.id) from account_voucher_line as l
+                            left join account_voucher as a ON (a.id=l.voucher_id)
+                            where a.id=av.id) as price_total_tax,
+                    sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
+                        from account_move_line as aml
+                        left join account_voucher as a ON (a.move_id=aml.move_id)
+                        left join account_voucher_line as l ON (a.id=l.voucher_id)
+                        where a.id=av.id)) as delay_to_pay,
+                    sum((select extract(epoch from avg(date_trunc('day',a.date_due)-date_trunc('day',a.date)))/(24*60*60)::decimal(16,2)
+                        from account_move_line as aml
+                        left join account_voucher as a ON (a.move_id=aml.move_id)
+                        left join account_voucher_line as l ON (a.id=l.voucher_id)
+                        where a.id=av.id)) as due_delay
+                from account_voucher_line as avl
+                left join account_voucher as av on (av.id=avl.voucher_id)
+                left join res_partner as rp ON (rp.id=av.partner_id)
+                left join account_journal as aj ON (aj.id=av.journal_id)
+                where av.type='sale' and aj.type in ('sale','sale_refund')
+                group by
+                    av.date,
+                    av.id,
+                    to_char(av.date, 'YYYY'),
+                    to_char(av.date, 'MM'),
+                    to_char(av.date, 'YYYY-MM-DD'),
+                    av.partner_id,
+                    av.currency_id,
+                    av.journal_id,
+                    rp.user_id,
+                    av.company_id,
+                    av.type,
+                    av.state,
+                    av.date_due,
+                    av.account_id,
+                    av.tax_amount,
+                    av.amount,
+                    av.tax_amount,
+                    av.pay_now
+            )
+        """)
+
+sale_receipt_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
new file mode 100644
index 00000000000..ad32978ddd8
--- /dev/null
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data> 
+   
+   <record id="view_sale_receipt_report_tree" model="ir.ui.view">
+        <field name="name">sale.receipt.report.tree</field>
+        <field name="model">sale.receipt.report</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree colors="blue:state in ('draft');gray:state in ('cancel','paid');black:state in ('proforma','proforma2')"  string="Sales Receipt Analysis">
+                <field name="date" invisible="1"/>
+                <field name="user_id" invisible="1"/>
+                <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="type" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="currency_id" invisible="1"/>
+                <field name="journal_id" invisible="1"/>
+                <field name="date_due" invisible="1"/>
+                <field name="account_id" invisible="1"/>
+                <field name="nbr" sum="# of Voucher Lines"/>
+                <field name="price_total" sum="Total Without Tax"/>
+                <field name="price_total_tax" sum="Total With Tax"/>
+                <field name="due_delay"  sum="Avg. Due Delay"/>
+                <field name="delay_to_pay"  sum="Avg. Delay To Pay"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_sale_receipt_report_graph" model="ir.ui.view">
+         <field name="name">sale.receipt.report.graph</field>
+         <field name="model">sale.receipt.report</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Sales Receipt Analysis" type="bar">
+                 <field name="account_id"/>
+                 <field name="price_total"/>
+             </graph>
+         </field>
+    </record>
+
+    <record id="view_sale_receipt_report_search" model="ir.ui.view">
+        <field name="name">sale.receipt.report.search</field>
+        <field name="model">sale.receipt.report</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Sales Receipt Analysis">
+              <group col="10" colspan="12">
+                    <filter string="Draft"
+                           icon="terp-document-new"
+                           domain="[('state','=','draft')]"
+                           help = "Draft Vouchers"/>
+                    <filter string="Pro-forma"
+                           icon="terp-gtk-media-pause"
+                           domain="[('state','=','proforma')]"
+                           help = "Pro-forma Vouchers"/>
+                    <filter string="Posted"
+                           name="current"
+                           icon="terp-check"
+                           domain="[('state','not in', ('draft','cancel'))]"
+                           help = "Validated Vouchers"/>
+                   <separator orientation="vertical"/>
+                   <field name="partner_id"/>
+                   <field name="date" string="Voucher Date"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="journal_id" widget="selection"/>
+                    <field name="pay_now"/>
+                    <field name="account_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_due"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
+                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
+                    <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
+                    <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_sale_receipt_report_all" model="ir.actions.act_window">
+        <field name="name">Sales Receipt Analysis</field>
+        <field name="res_model">sale.receipt.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,graph</field>
+        <field name="context">{'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="search_view_id" ref="view_sale_receipt_report_search"/>
+        <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
+
+    </record>
+
+    <menuitem action="action_sale_receipt_report_all" id="menu_action_sale_receipt_report_all" parent="account.menu_finance_statistic_report_statement" sequence="3"/>
+       
+   </data>
+</openerp>
+\ No newline at end of file
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index a9fb7d10a32..f3ce59f7b0b 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -35,7 +35,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
     }
 
     def populate_statement(self, cr, uid, ids, context=None):
-        if context is None: 
+        if context is None:
             context = {}
         statement_id = context.get('statement_id', False)
         if not statement_id:
@@ -75,7 +75,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                     statement.currency.id, amount, context=ctx)
 
             context.update({'move_line_ids': [line.id]})
-            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), context=context)
+            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), date=time.strftime('%Y-%m-%d'), context=context)
             voucher_res = { 'type':(amount < 0 and 'payment' or 'receipt'),
                             'name': line.name,
                             'partner_id': line.partner_id.id,
@@ -135,7 +135,7 @@ class account_statement_from_invoice(osv.osv_memory):
     }
 
     def search_invoices(self, cr, uid, ids, context=None):
-        if context is None: 
+        if context is None:
             context = {}
         line_obj = self.pool.get('account.move.line')
         statement_obj = self.pool.get('account.bank.statement')
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index f87df6200d6..a94d1a36a9d 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -30,11 +30,15 @@ class account_analytic_account(osv.osv):
 
     def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None):
         def recursive_computation(account_id, res):
+            currency_obj = self.pool.get('res.currency')
             account = self.browse(cr, uid, account_id)
             for son in account.child_ids:
                 res = recursive_computation(son.id, res)
                 for field in field_names:
-                    res[account.id][field] += res[son.id][field]
+                    if account.currency_id.id == son.currency_id.id:
+                        res[account.id][field] += res[son.id][field]
+                    else:
+                        res[account.id][field] += currency_obj.compute(cr, uid, son.currency_id.id, account.currency_id.id, res[son.id][field], context=context)
             return res
         for account in self.browse(cr, uid, ids, context=context):
             if account.id not in child_ids:
@@ -125,7 +129,7 @@ class account_analytic_account(osv.osv):
         'user_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End'),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
         'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
@@ -133,7 +137,7 @@ class account_analytic_account(osv.osv):
                                   \n* And finally when all the transactions are over, it can be in \'Close\' state. \
                                   \n* The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
                                  \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
-       'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, readonly=True),
+       'currency_id': fields.many2one('res.currency', 'Account currency', required=True),
     }
 
     def _default_company(self, cr, uid, context=None):
@@ -142,6 +146,10 @@ class account_analytic_account(osv.osv):
             return user.company_id.id
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
 
+    def _get_default_currency(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return user.company_id.currency_id.id
+
     _defaults = {
         'type': 'normal',
         'company_id': _default_company,
@@ -149,15 +157,24 @@ class account_analytic_account(osv.osv):
         'user_id': lambda self, cr, uid, ctx: uid,
         'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
         'contact_id': lambda self, cr, uid, ctx: ctx.get('contact_id', False),
-        'date_start': lambda *a: time.strftime('%Y-%m-%d')
+        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
+        'currency_id': _get_default_currency,
     }
 
+    def check_currency(self, cr, uid, ids, context=None):
+        obj = self.browse(cr, uid, ids[0], context=context)
+        if obj.company_id:
+            if obj.currency_id.id != self.pool.get('res.company').browse(cr, uid, obj.company_id.id, context=context).currency_id.id:
+                return False
+        return True
+
     def check_recursion(self, cr, uid, ids, parent=None):
         return super(account_analytic_account, self)._check_recursion(cr, uid, ids, parent=parent)
 
     _order = 'date_start desc,parent_id desc,code'
     _constraints = [
-        (check_recursion, 'Error! You can not create recursive analytic accounts.', ['parent_id'])
+        (check_recursion, 'Error! You can not create recursive analytic accounts.', ['parent_id']),
+        (check_currency, 'Error! The currency has to be the same as the currency of the selected company', ['currency_id', 'company_id']),
     ]
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -167,6 +184,12 @@ class account_analytic_account(osv.osv):
         default['line_ids'] = []
         return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
 
+    def on_change_company(self, cr, uid, id, company_id):
+        if not company_id:
+            return {}
+        currency = self.pool.get('res.company').read(cr, uid, [company_id], ['currency_id'])[0]['currency_id']
+        return {'value': {'currency_id': currency}}
+
     def on_change_parent(self, cr, uid, id, parent_id):
         if not parent_id:
             return {}
diff --git a/addons/analytic/i18n/el.po b/addons/analytic/i18n/el.po
index 0bab19b40d6..ef1eef949f3 100644
--- a/addons/analytic/i18n/el.po
+++ b/addons/analytic/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-10-23 07:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 17:18+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -30,7 +30,7 @@ msgstr "Όνομα λογαριασμού"
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
-msgstr ""
+msgstr "Καθορίζει την επιμετρούμενη ποσότητα"
 
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
@@ -38,6 +38,8 @@ msgid ""
 "Module for defining analytic accounting object.\n"
 "    "
 msgstr ""
+"Άρθρωμα προς ορισμό αντικειμένου αναλυτικής λογιστικής\n"
+"    "
 
 #. module: analytic
 #: field:account.analytic.account,state:0
@@ -101,7 +103,7 @@ msgstr "Εκκρεμεί"
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Γραμμή Αναλυτικής"
 
 #. module: analytic
 #: field:account.analytic.account,description:0
@@ -143,7 +145,7 @@ msgstr "Ημερομηνία"
 #. module: analytic
 #: field:account.analytic.account,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Νόμισμα Λογαριασμού"
 
 #. module: analytic
 #: field:account.analytic.account,quantity:0
@@ -157,11 +159,14 @@ msgid ""
 "Calculated by multiplying the quantity and the price given in the Product's "
 "cost price. Always expressed in the company main currency."
 msgstr ""
+"Υπολογίστηκε πολλαπλασιάζοντας τη νποσότητα επί την τιμή που προκύπτει από "
+"την τιμή κόστους του πίνακα Προϊόντων. Πάντα εκφράζεται στο κύριο νόμισμα "
+"της εταιρείας."
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of quantity of hours."
-msgstr ""
+msgstr "Θέτει τα ανώτατα όρια των ωρών"
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -199,6 +204,8 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
+"Εαν επιλέξετε Προβολή Τύπου, αυτό σημαίνει ότι δεν θα επιτρέπετε την "
+"δημιουργία εγγραφών ημερολογίου χρησιμοποιόντας αυτόν τον λογαριασμό."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
diff --git a/addons/analytic/i18n/es.po b/addons/analytic/i18n/es.po
index 5f5a01a8fe6..bd6b2c2a802 100644
--- a/addons/analytic/i18n/es.po
+++ b/addons/analytic/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:17+0000\n"
+"PO-Revision-Date: 2010-12-27 09:11+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
index 27210bd7dee..b99c536198a 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
@@ -35,8 +35,8 @@
             <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='to_invoice']" position="after">
-                    <field name="journal_rate_ids" colspan="4"/>
-                </xpath>
+                    <field name="journal_rate_ids" nolabel="1" colspan="4"/>
+                </xpath>                
             </field>
         </record>
 
diff --git a/addons/analytic_journal_billing_rate/i18n/el.po b/addons/analytic_journal_billing_rate/i18n/el.po
index 0bc307f16c2..83601f9085e 100644
--- a/addons/analytic_journal_billing_rate/i18n/el.po
+++ b/addons/analytic_journal_billing_rate/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2009-09-08 13:49+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"PO-Revision-Date: 2010-12-28 17:14+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
@@ -71,7 +71,7 @@ msgstr ""
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Τιμολόγιο"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,rate_id:0
@@ -86,7 +86,7 @@ msgstr ""
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
 
 #~ msgid "Analytic Journal Billing Rate"
 #~ msgstr "Ποσό Τιμολόγησης Ημερολόγιου Αναλυτικής"
diff --git a/addons/analytic_journal_billing_rate/i18n/es.po b/addons/analytic_journal_billing_rate/i18n/es.po
index f15df4249d4..9217306dbcd 100644
--- a/addons/analytic_journal_billing_rate/i18n/es.po
+++ b/addons/analytic_journal_billing_rate/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:01+0000\n"
+"PO-Revision-Date: 2010-12-27 08:47+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index dd7f5e3be5a..e9e6735e6e9 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:41+0000\n"
+"PO-Revision-Date: 2010-12-28 07:56+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -77,6 +77,22 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    Dieses Modul ermöglicht die Definition einer benutzerbezogenen Zuordnung "
+"von  Dienstleistungsprodukten zu analytischen Konten. Die Funktion dieses "
+"Moduls wird vor allem dann eingesetzt, wenn ein Benutzer seine "
+"Arbeitszeiterfassung vornimmt: Die Konten werden automatisch durch das "
+"System ermittelt, damit die entsprechenden Felder bei der Erfassung "
+"automatisch ausgefüllt werden ... dennoch besteht jederzeit die Möglichkeit, "
+"diese Werte bei Bedarf abzuändern.\n"
+"\n"
+"     Wenn offensichtlich keine besondere Zuordnung für diese Konten "
+"hinterlegt wurde , wird der Standardwert wie gewohnt über die "
+"Kontenzuordnung beim Mitarbeiter ermittelt, so dass dieses Modul auch "
+"weiterhin kompatibel mit älteren Konfigurationen ist.\n"
+"\n"
+"    "
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
@@ -86,7 +102,7 @@ msgstr "Analytische Benutzer Funktion"
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Analytische Konten definieren."
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index 9070ce6f58a..9d810a11045 100644
--- a/addons/analytic_user_function/i18n/el.po
+++ b/addons/analytic_user_function/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-08-03 02:54+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 17:21+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -26,12 +26,12 @@ msgstr "Προϊόν"
 #: code:addons/analytic_user_function/analytic_user_function.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Σφάλμα!"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
@@ -55,6 +55,7 @@ msgstr "Χρήστης"
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
+"Δεν έχει οριστεί λογαριασμός εξόδων για αυτό το προϊόν: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index f651ffd233d..ea524eb6a56 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:04+0000\n"
+"PO-Revision-Date: 2010-12-27 09:12+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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 e678743840a..3eee6f2985b 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.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: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-24 08:06+0000\n"
+"PO-Revision-Date: 2010-12-28 07:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -86,7 +86,7 @@ msgstr "Funzione di utente analitico"
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
diff --git a/addons/association/i18n/de.po b/addons/association/i18n/de.po
index b762468a2b2..b5502df4edc 100644
--- a/addons/association/i18n/de.po
+++ b/addons/association/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:45+0000\n"
+"PO-Revision-Date: 2010-12-28 07:54+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -50,6 +50,8 @@ msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
 msgstr ""
+"Hier finden Sie die vorzunehmenden Einstellungen für das Profil "
+"Mitgliederverwaltung."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -105,7 +107,7 @@ msgstr "Ausgabenkontrolle"
 #: model:ir.actions.act_window,name:association.action_config_install_module
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Association Application Configuration"
-msgstr ""
+msgstr "Konfiguration Mitgliederverwaltung"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -144,7 +146,7 @@ msgstr "Projektmanagement"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/association/i18n/el.po b/addons/association/i18n/el.po
index 466b740772c..03b34147a18 100644
--- a/addons/association/i18n/el.po
+++ b/addons/association/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:20+0000\n"
+"PO-Revision-Date: 2010-12-28 17:27+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -135,7 +135,7 @@ msgstr "Διαχείριση Έργων"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Παραμετροποίηση"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/association/i18n/it.po b/addons/association/i18n/it.po
index 62f90696d75..b7ec3bd0db5 100644
--- a/addons/association/i18n/it.po
+++ b/addons/association/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-22 07:37+0000\n"
+"PO-Revision-Date: 2010-12-28 08:30+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -34,7 +34,7 @@ msgstr "Getting Things Done (GTD)"
 #. module: association
 #: model:ir.module.module,description:association.module_meta_information
 msgid "This module is to create Profile for Associates"
-msgstr ""
+msgstr "Questo modulo è per creare profili per i soci"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 983bdeb0144..20442f16250 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -186,7 +186,7 @@ class aie_category(osv.osv):
        'name': fields.char('Name', size=64, required=True),
        'code':fields.char('Code', size=64),
        'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'),
-       'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category")
+       'child_ids': fields.one2many('aie.category', 'parent_id', help="children aie category")
     }
 
     def name_get(self, cr, uid, ids, context=None):
diff --git a/addons/auction/i18n/ar.po b/addons/auction/i18n/ar.po
index 1d0c72ca99b..2dd5dc150d1 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-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot
index 2366d44d9d5..66c5eb6c020 100644
--- a/addons/auction/i18n/auction.pot
+++ b/addons/auction/i18n/auction.pot
@@ -1441,7 +1441,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/bg.po b/addons/auction/i18n/bg.po
index 1b326149bdf..17e9536e62d 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-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/bs.po b/addons/auction/i18n/bs.po
index 6484cab105b..0eb810c0c50 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-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/ca.po b/addons/auction/i18n/ca.po
index b6210be0201..ec2d7d21256 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-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr "Lot"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/cs.po b/addons/auction/i18n/cs.po
index 588096eb0e1..1b56a87a47b 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/de.po b/addons/auction/i18n/de.po
index 30a09fc4301..ad64d4fc7fe 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Auktionslos"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po
index d58685861ae..2c3c24e6fa2 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr "Παρτίδα"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/es.po b/addons/auction/i18n/es.po
index d21add0d670..e7aa22f719f 100644
--- a/addons/auction/i18n/es.po
+++ b/addons/auction/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-10-30 08:44+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 13:37+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -44,7 +43,7 @@ msgstr "Vendedor"
 #. module: auction
 #: field:auction.lots,name:0
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #. module: auction
 #: field:auction.lots.sms.send,text:0
@@ -56,7 +55,7 @@ msgstr "Mensaje SMS"
 #: view:auction.lots.auction.move:0
 #: view:auction.lots.make.invoice.buyer:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -82,7 +81,7 @@ msgstr "Nº de objetos"
 #. module: auction
 #: view:auction.lots:0
 msgid "Authors"
-msgstr ""
+msgstr "Autores"
 
 #. module: auction
 #: view:auction.bid:0
@@ -129,7 +128,7 @@ msgstr "Importe facturado"
 #. module: auction
 #: help:auction.lots,name:0
 msgid "Auction object name"
-msgstr ""
+msgstr "Nombre objeto subastado"
 
 #. module: auction
 #: model:ir.model,name:auction.model_aie_category
@@ -153,7 +152,7 @@ msgstr "Justificante de depósito"
 #. module: auction
 #: view:auction.deposit:0
 msgid "Reference"
-msgstr ""
+msgstr "Referencia"
 
 #. module: auction
 #: help:auction.dates,state:0
@@ -180,7 +179,7 @@ msgstr "Núm. de lista"
 #. module: auction
 #: report:buyer.list:0
 msgid "Date:"
-msgstr ""
+msgstr "Fecha:"
 
 #. module: auction
 #: field:auction.deposit.cost,name:0
@@ -200,12 +199,12 @@ msgstr "Estado"
 #. module: auction
 #: view:auction.dates:0
 msgid "First Auction Date"
-msgstr ""
+msgstr "Primera fecha subasta"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: auction
 #: help:auction.lot.category,active:0
@@ -222,7 +221,7 @@ msgstr "Ref."
 #. module: auction
 #: field:report.auction,total_price:0
 msgid "Total Price"
-msgstr ""
+msgstr "Precio total"
 
 #. module: auction
 #: view:auction.lots:0
@@ -280,7 +279,7 @@ msgstr "Apuestas"
 #. module: auction
 #: view:auction.lots.buyer_map:0
 msgid "Buyer Map"
-msgstr ""
+msgstr "Mapa compradores"
 
 #. module: auction
 #: field:report.object.encoded,obj_ret:0
@@ -290,18 +289,18 @@ msgstr "Nº obj ret"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_bid
 msgid "Bid Auctions"
-msgstr ""
+msgstr "Pujar subastas"
 
 #. module: auction
 #: help:auction.lots,image:0
 msgid "Object Image"
-msgstr ""
+msgstr "Imagen del objeto"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_buyer_map.py:0
 #, python-format
 msgid "No buyer is set for this lot."
-msgstr ""
+msgstr "No hay comprador para este lote."
 
 #. module: auction
 #: code:addons/auction/auction.py:0
@@ -327,12 +326,12 @@ msgstr "Formulario justificante de depósito"
 #. module: auction
 #: help:auction.lots,statement_id:0
 msgid "Bank statement line for given buyer"
-msgstr ""
+msgstr "Línea extracto bancario para el comprador dado"
 
 #. module: auction
 #: field:auction.lot.category,aie_categ:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
@@ -342,7 +341,7 @@ msgstr "Asociar nombre de comprador a empresas"
 #. module: auction
 #: view:auction.lots:0
 msgid "Search Auction Lots"
-msgstr ""
+msgstr "Buscar lotes subastados"
 
 #. module: auction
 #: field:report.auction,net_revenue:0
@@ -363,7 +362,7 @@ msgstr "Enviar SMS"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: auction
 #: view:auction.lots:0
@@ -376,18 +375,18 @@ msgstr "Vendido"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
 #, python-format
 msgid "No Lots belong to this Auction Date"
-msgstr ""
+msgstr "Ningún lote pertenece a esta fecha de subasta"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: auction
 #: field:auction.bid_line,name:0
@@ -412,17 +411,17 @@ msgstr "Descripción del objeto"
 #. module: auction
 #: field:auction.lots,artist2_id:0
 msgid "Artist/Author2"
-msgstr ""
+msgstr "Artist/Autor2"
 
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Line1"
-msgstr ""
+msgstr "Línea1"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
 msgid "Make Invoice for Buyer"
-msgstr ""
+msgstr "Crear factura para el comprador"
 
 #. module: auction
 #: field:auction.lots,gross_revenue:0
@@ -438,7 +437,7 @@ msgstr "Pagar objetos del comprador"
 #. module: auction
 #: help:auction.dates,auction2:0
 msgid "End date of auction"
-msgstr ""
+msgstr "Fecha fin de la subasta"
 
 #. module: auction
 #: view:auction.lots.sms.send:0
@@ -464,7 +463,7 @@ msgstr "IVA 12%"
 #. module: auction
 #: view:auction.dates:0
 msgid "Buyer Invoices"
-msgstr ""
+msgstr "Facturas comprador"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.res_w_buyer
@@ -479,7 +478,7 @@ msgstr "Precio máximo"
 #. module: auction
 #: help:auction.dates,auction1:0
 msgid "Start date of auction"
-msgstr ""
+msgstr "Fecha inicio de la subasta"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_auction_move
@@ -489,12 +488,12 @@ msgstr ""
 #. module: auction
 #: help:auction.dates,buyer_costs:0
 msgid "Account tax for buyer"
-msgstr ""
+msgstr "Cuenta impuestos para el comprador"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Next Auction"
-msgstr ""
+msgstr "Siguiente subasta"
 
 #. module: auction
 #: view:auction.taken:0
@@ -520,12 +519,12 @@ msgstr "Guardar hasta la venta"
 #. module: auction
 #: view:auction.dates:0
 msgid "Last Auction Date"
-msgstr ""
+msgstr "Fecha última subasta"
 
 #. module: auction
 #: model:account.tax,name:auction.tax_seller
 msgid "Seller Costs (12%)"
-msgstr ""
+msgstr "Costes vendedor (12%)"
 
 #. module: auction
 #: field:auction.lots,paid_vnd:0
@@ -574,12 +573,12 @@ msgstr "%)"
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer Information"
-msgstr ""
+msgstr "Información comprador"
 
 #. module: auction
 #: help:auction.lots,gross_revenue:0
 msgid "Buyer Price - Seller Price"
-msgstr ""
+msgstr "Precio comprador - Precio vendedor"
 
 #. module: auction
 #: field:auction.lots.make.invoice,objects:0
@@ -600,7 +599,7 @@ msgstr "Precio comprador"
 #. module: auction
 #: view:auction.lots:0
 msgid "Bids Details"
-msgstr ""
+msgstr "Detalles de la puja"
 
 #. module: auction
 #: field:auction.lots,is_ok:0
@@ -621,7 +620,7 @@ msgstr "Catálogo de subastas"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax4
@@ -647,14 +646,14 @@ msgstr "Costes indirectos"
 #. module: auction
 #: help:auction.dates,seller_costs:0
 msgid "Account tax for seller"
-msgstr ""
+msgstr "Cuenta impuesto para el vendedor"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_invoice.py:0
 #: code:addons/auction/wizard/auction_lots_numerotate.py:0
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Error de usuario"
 
 #. module: auction
 #: model:ir.module.module,shortdesc:auction.module_meta_information
@@ -692,13 +691,13 @@ msgstr ""
 #. module: auction
 #: view:auction.catalog.flagey:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: auction
 #: view:auction.lots:0
 #: view:report.auction:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: auction
 #: help:auction.lots,ach_emp:0
@@ -747,7 +746,7 @@ msgstr "Estimación mín.:"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: auction
 #: field:report.auction,net_margin:0
@@ -762,7 +761,7 @@ msgstr "¿Límite neto?"
 #. module: auction
 #: field:aie.category,child_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "desconocido"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -788,7 +787,7 @@ msgstr ""
 #. module: auction
 #: view:report.auction:0
 msgid "Auction Summary"
-msgstr ""
+msgstr "Resumen subasta"
 
 #. module: auction
 #: view:auction.lots.make.invoice:0
@@ -811,17 +810,17 @@ msgstr ""
 #: code:addons/auction/wizard/auction_lots_numerotate.py:0
 #, python-format
 msgid "This record does not exist !"
-msgstr ""
+msgstr "¡ Este registro no existe !"
 
 #. module: auction
 #: field:auction.pay.buy,total:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Importe total"
 
 #. module: auction
 #: help:auction.pay.buy,amount:0
 msgid "Amount For First Bank Statement"
-msgstr ""
+msgstr "Importe para el primer extracto bancario"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_object_date
@@ -832,7 +831,7 @@ msgstr "Objetos por día"
 #. module: auction
 #: help:auction.lots,author_right:0
 msgid "Account tax for author commission"
-msgstr ""
+msgstr "Cuenta impuesto para la comisión del autor"
 
 #. module: auction
 #: model:product.template,name:auction.monproduit_product_template
@@ -863,12 +862,12 @@ msgstr "Costes extra"
 #. module: auction
 #: view:auction.lots.buyer_map:0
 msgid "Map "
-msgstr ""
+msgstr "Mapa "
 
 #. module: auction
 #: field:auction.lots,paid_ach:0
 msgid "Buyer Invoice Reconciled"
-msgstr ""
+msgstr "Factura comprador reconciliada"
 
 #. module: auction
 #: field:auction.deposit,date_dep:0
@@ -888,17 +887,17 @@ msgstr "Costes específicos"
 #. module: auction
 #: report:buyer.list:0
 msgid "To pay ("
-msgstr ""
+msgstr "A pagar ("
 
 #. module: auction
 #: model:account.tax,name:auction.tax_buyer
 msgid "Buyer Costs (20%)"
-msgstr ""
+msgstr "Costes comprador (20%)"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction
 msgid "Dashboard"
-msgstr ""
+msgstr "Cuadro de mandos"
 
 #. module: auction
 #: view:auction.dates:0
@@ -916,12 +915,12 @@ msgstr "Total adjudicaciones"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_make_invoice
 msgid "Make invoice"
-msgstr ""
+msgstr "Crear factura"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: auction
 #: view:auction.dates:0
@@ -932,7 +931,7 @@ msgstr "Historial"
 #. module: auction
 #: field:aie.category,code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: auction
 #: report:auction.code_bar_lot:0
@@ -957,7 +956,7 @@ msgstr "Cancelar"
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer's Payment History"
-msgstr ""
+msgstr "Historial de pagos del comprador"
 
 #. module: auction
 #: view:auction.artists:0
@@ -978,7 +977,7 @@ msgstr "Pagar"
 #. module: auction
 #: view:auction.lots.make.invoice:0
 msgid "Create Invoices For Seller"
-msgstr ""
+msgstr "Crear facturas para el vendedor"
 
 #. module: auction
 #: field:report.object.encoded,obj_margin:0
@@ -1000,6 +999,8 @@ msgstr "Analítico"
 msgid ""
 "When state of Buyer Invoice is 'Paid', this field is selected as True."
 msgstr ""
+"Cuando el estado de la factura del comprador es 'Pagada', este campo se pone "
+"a verdadero."
 
 #. module: auction
 #: report:bids.lots:0
@@ -1026,17 +1027,17 @@ msgstr "Facturar objetos comprador"
 #. module: auction
 #: view:report.auction:0
 msgid "My Auction"
-msgstr ""
+msgstr "Mi subasta"
 
 #. module: auction
 #: help:auction.lots,gross_margin:0
 msgid "(Gross Revenue*100.0)/ Object Price"
-msgstr ""
+msgstr "(Ingresos brutos*100.0)/ Precio objeto"
 
 #. module: auction
 #: field:auction.bid,contact_tel:0
 msgid "Contact Number"
-msgstr ""
+msgstr "Número de contacto"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1064,7 +1065,7 @@ msgstr "Número factura"
 #: code:addons/auction/wizard/auction_lots_numerotate.py:0
 #, python-format
 msgid "Active IDs not Found"
-msgstr ""
+msgstr "No se encontraron IDs activos"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_aie_send.py:0
@@ -1081,7 +1082,7 @@ msgstr "Ingreso bruto"
 #. module: auction
 #: model:ir.actions.act_window,name:auction.open_board_auction
 msgid "Auction board"
-msgstr ""
+msgstr "Tablero subasta"
 
 #. module: auction
 #: field:aie.category,name:0
@@ -1136,7 +1137,7 @@ msgstr "Marcar lotes"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots
 msgid "Auction Object"
-msgstr ""
+msgstr "Objeto subastado"
 
 #. module: auction
 #: field:auction.lots,obj_num:0
@@ -1176,12 +1177,12 @@ msgstr "Derechos de autor"
 #: view:auction.lots:0
 #: view:report.auction:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: auction
 #: help:auction.dates,journal_id:0
 msgid "Account journal for buyer"
-msgstr ""
+msgstr "Diario contable para comprador"
 
 #. module: auction
 #: field:auction.bid,bid_lines:0
@@ -1210,12 +1211,12 @@ msgstr "Vendedores"
 #. module: auction
 #: help:auction.lots,lot_est2:0
 msgid "Maximum Estimate Price"
-msgstr ""
+msgstr "Precio máximo estimado"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -1230,7 +1231,7 @@ msgstr "Nº de artículos no vendidos:"
 #. module: auction
 #: view:auction.dates:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Crear facturas"
 
 #. module: auction
 #: field:auction.bid,auction_id:0
@@ -1247,7 +1248,7 @@ msgstr ", ID"
 #. module: auction
 #: report:buyer.list:0
 msgid "Adj.("
-msgstr ""
+msgstr "Adj.("
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.lot_list_inv
@@ -1257,7 +1258,7 @@ msgstr "Lista de lotes - Horizontal"
 #. module: auction
 #: view:auction.artists:0
 msgid "Author/Artist"
-msgstr ""
+msgstr "Autor/Artista"
 
 #. module: auction
 #: field:auction.lots,ach_login:0
@@ -1283,12 +1284,12 @@ msgstr "Lugar"
 #. module: auction
 #: view:report.auction:0
 msgid "Month -1"
-msgstr ""
+msgstr "Mes -1"
 
 #. module: auction
 #: help:auction.lots,is_ok:0
 msgid "When buyer pay for bank statement', this field is marked"
-msgstr ""
+msgstr "Cuando el comprador paga por extracto bancario', se marca este campo"
 
 #. module: auction
 #: field:auction.lots,ach_emp:0
@@ -1303,12 +1304,12 @@ msgstr "Total ing. bruto"
 #. module: auction
 #: help:auction.lots,lot_est1:0
 msgid "Minimum Estimate Price"
-msgstr ""
+msgstr "Precio mínimo estimado"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Date"
-msgstr ""
+msgstr "Fecha depósito"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_numerotate.py:0
@@ -1319,7 +1320,7 @@ msgstr "¡Este lote no existe!"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: auction
 #: field:auction.bid_line,call:0
@@ -1340,7 +1341,7 @@ msgstr "Estimación mínima"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_sms_send
 msgid "Sms send "
-msgstr ""
+msgstr "Mandar sms "
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -1351,7 +1352,7 @@ msgstr "Cambiar fecha subasta"
 #. module: auction
 #: field:auction.artists,birth_death_dates:0
 msgid "Lifespan"
-msgstr ""
+msgstr "Período de vida"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -1362,19 +1363,19 @@ msgstr "Método de retirada"
 #. module: auction
 #: view:auction.dates:0
 msgid "Buyer Commissions"
-msgstr ""
+msgstr "Comisiones comprador"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_auction
 #: model:ir.ui.menu,name:auction.menu_report_auction
 msgid "Auction Analysis"
-msgstr ""
+msgstr "Análisis subastas"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_pay_buy.py:0
 #, python-format
 msgid "Payment aborted !"
-msgstr ""
+msgstr "¡ Pago abortado !"
 
 #. module: auction
 #: field:auction.lot.history,price:0
@@ -1389,7 +1390,7 @@ msgstr "Inicio de la subasta"
 #. module: auction
 #: help:auction.pay.buy,statement_id3:0
 msgid "Third Bank Statement For Buyer"
-msgstr ""
+msgstr "Tercer extracto bancario para el comprador"
 
 #. module: auction
 #: view:report.auction:0
@@ -1406,7 +1407,7 @@ msgstr "Estimación máxima:"
 #. module: auction
 #: view:auction.lots:0
 msgid "Statistical"
-msgstr ""
+msgstr "Estadística"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_deposit
@@ -1416,17 +1417,17 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
 msgid "Object statistics"
-msgstr ""
+msgstr "Estadísticas de objeto"
 
 #. module: auction
 #: help:auction.lots,net_margin:0
 msgid "(Net Revenue * 100)/ Object Price"
-msgstr ""
+msgstr "(Ingreso neto * 100)/ Precio del objeto"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
 msgid "Lot History"
-msgstr ""
+msgstr "Historial de lote"
 
 #. module: auction
 #: view:auction.lots.make.invoice:0
@@ -1451,7 +1452,7 @@ msgstr "Lote"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
@@ -1462,12 +1463,12 @@ msgstr "subasta.artistas"
 #. module: auction
 #: field:report.auction,avg_price:0
 msgid "Avg Price."
-msgstr ""
+msgstr "Precio prom."
 
 #. module: auction
 #: help:auction.pay.buy,statement_id2:0
 msgid "Second Bank Statement For Buyer"
-msgstr ""
+msgstr "Segundo extracto bancario para el comprador"
 
 #. module: auction
 #: field:auction.dates,journal_id:0
@@ -1494,7 +1495,7 @@ msgstr "Activa"
 #. module: auction
 #: view:auction.dates:0
 msgid "Exposition Dates"
-msgstr ""
+msgstr "Fechas exposición"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax1
@@ -1536,7 +1537,7 @@ msgstr "Objetos por día"
 #. module: auction
 #: help:auction.dates,expo2:0
 msgid "Last exposition date for auction"
-msgstr ""
+msgstr "Última fecha de exposición para la subasta"
 
 #. module: auction
 #: code:addons/auction/auction.py:0
@@ -1561,11 +1562,13 @@ msgid ""
 "Two different buyers for the same invoice !\n"
 "Please correct this problem before invoicing"
 msgstr ""
+"Dos compradores diferentes para la misma factura !\n"
+"Por favor, corrija este problema antes de facturar"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: auction
 #: field:auction.lots,vnd_lim:0
@@ -1580,12 +1583,12 @@ msgstr "Transferencia"
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Line3"
-msgstr ""
+msgstr "Línea3"
 
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Line2"
-msgstr ""
+msgstr "Línea2"
 
 #. module: auction
 #: help:auction.lots,obj_ret:0
@@ -1620,12 +1623,12 @@ msgstr "Producto"
 #. module: auction
 #: report:buyer.list:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Seller Information"
-msgstr ""
+msgstr "Información vendedor"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -1639,7 +1642,7 @@ msgstr "Objetos"
 #. module: auction
 #: view:auction.dates:0
 msgid "Seller Invoices"
-msgstr ""
+msgstr "Facturas vendedor"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -1654,7 +1657,7 @@ msgstr "Permitir importe negativo"
 #. module: auction
 #: help:auction.pay.buy,amount2:0
 msgid "Amount For Second Bank Statement"
-msgstr ""
+msgstr "Importe para el segundo extracto bancario"
 
 #. module: auction
 #: field:auction.lot.history,auction_id:0
@@ -1666,7 +1669,7 @@ msgstr "Fecha subasta"
 #. module: auction
 #: view:auction.lots.sms.send:0
 msgid "SMS Text"
-msgstr ""
+msgstr "Texto SMS"
 
 #. module: auction
 #: field:auction.dates,auction1:0
@@ -1676,7 +1679,7 @@ msgstr "Primer día subasta"
 #. module: auction
 #: view:auction.lots.make.invoice.buyer:0
 msgid "Create Invoices For Buyer"
-msgstr ""
+msgstr "Crear facturas para el comprador"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1692,12 +1695,12 @@ msgstr "Artistas"
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Pay Objects"
-msgstr ""
+msgstr "Pagar objetos"
 
 #. module: auction
 #: help:auction.dates,expo1:0
 msgid "Beginning exposition date for auction"
-msgstr ""
+msgstr "Fecha inicio exposición para la subasta"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
@@ -1712,7 +1715,7 @@ msgstr ""
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_enable
 msgid "Lots Enable"
-msgstr ""
+msgstr "Activar lotes"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1745,7 +1748,7 @@ msgstr "Extracto"
 #: help:auction.lots,seller_price:0
 #: help:auction.lots.make.invoice,amount:0
 msgid "Seller Price"
-msgstr ""
+msgstr "Precio vendedor"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax20
@@ -1766,7 +1769,7 @@ msgstr "Derechos de autor"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_buyer_map
 msgid "Map Buyer"
-msgstr ""
+msgstr "Mapa comprador"
 
 #. module: auction
 #: field:report.auction.object.date,name:0
@@ -1791,7 +1794,7 @@ msgstr "Ingreso neto"
 #: code:addons/auction/wizard/auction_pay_buy.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -1801,7 +1804,7 @@ msgstr "Nº de artículos:"
 #. module: auction
 #: model:account.tax,name:auction.tax_buyer_author
 msgid "Author rights (4%)"
-msgstr ""
+msgstr "Derechos de autor (4%)"
 
 #. module: auction
 #: field:report.object.encoded,estimation:0
@@ -1830,7 +1833,7 @@ msgstr ""
 #. module: auction
 #: view:auction.taken:0
 msgid "OK"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.buyer_form_id
@@ -1846,7 +1849,7 @@ msgstr "Nombre comprador"
 #: view:report.auction:0
 #: field:report.auction,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
@@ -1867,7 +1870,7 @@ msgstr "Cerrado"
 #. module: auction
 #: view:auction.dates:0
 msgid "Search Next Auction Dates"
-msgstr ""
+msgstr "Buscar fechas siguiente subasta"
 
 #. module: auction
 #: view:auction.catalog.flagey:0
@@ -1897,12 +1900,12 @@ msgstr ""
 #. module: auction
 #: help:auction.lots,obj_price:0
 msgid "Object Price"
-msgstr ""
+msgstr "Precio objeto"
 
 #. module: auction
 #: view:auction.bid:0
 msgid "Bids Lines"
-msgstr ""
+msgstr "Líneas pujas"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1912,7 +1915,7 @@ msgstr "Catálogo"
 #. module: auction
 #: help:auction.lots,auction_id:0
 msgid "Auction for object"
-msgstr ""
+msgstr "Subasta para objeto"
 
 #. module: auction
 #: field:auction.deposit.cost,account:0
@@ -1934,7 +1937,7 @@ msgstr ""
 #. module: auction
 #: model:ir.model,name:auction.model_auction_pay_buy
 msgid "Pay buy"
-msgstr ""
+msgstr "Pagar compra"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_outils_menu
@@ -1969,7 +1972,7 @@ msgstr "Artista / Nombre autor"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: auction
 #: field:auction.lots,image:0
@@ -1980,12 +1983,12 @@ msgstr "Imagen"
 #: help:auction.lots,buyer_price:0
 #: help:auction.lots.make.invoice.buyer,amount:0
 msgid "Buyer Price"
-msgstr ""
+msgstr "Precio comprador"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_category
 msgid "Auction Lots Category"
-msgstr ""
+msgstr "Categoría lotes subasta"
 
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id2
@@ -1995,7 +1998,7 @@ msgstr "IVA 20%"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_payer_sel
 msgid "Auction payment for seller"
-msgstr ""
+msgstr "Pago subasta para vendedor"
 
 #. module: auction
 #: view:auction.lots:0
@@ -2026,7 +2029,7 @@ msgstr "........."
 #. module: auction
 #: view:report.auction:0
 msgid "Auction Summary tree view"
-msgstr ""
+msgstr "Vista resumen de subasta en árbol"
 
 #. module: auction
 #: report:report.auction.buyer.result:0
@@ -2042,7 +2045,7 @@ msgstr "Fechas subasta"
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction_open
 msgid "Auction DashBoard"
-msgstr ""
+msgstr "Panel de mandos de subasta"
 
 #. module: auction
 #: view:report.auction:0
@@ -2056,7 +2059,7 @@ msgstr "Usuario"
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Líneas de pago"
 
 #. module: auction
 #: code:addons/auction/auction.py:0
@@ -2067,12 +2070,12 @@ msgstr "¡Falta dirección!"
 #. module: auction
 #: help:auction.lots,net_revenue:0
 msgid "Buyer Price - Seller Price - Indirect Cost"
-msgstr ""
+msgstr "Precio comprador - Precio vendedor - Coste indirecto"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
 msgid "Open Bids"
-msgstr ""
+msgstr "Pujas abiertas"
 
 #. module: auction
 #: field:auction.artists,pseudo:0
@@ -2129,7 +2132,7 @@ msgstr "Totales subasta con listas"
 #. module: auction
 #: view:auction.deposit:0
 msgid "General Information"
-msgstr ""
+msgstr "Información general"
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -2149,7 +2152,7 @@ msgstr "Objeto codificado"
 #. module: auction
 #: view:auction.bid:0
 msgid "Search Auction Bid"
-msgstr ""
+msgstr "Buscar puja subasta"
 
 #. module: auction
 #: report:bids.phones.details:0
@@ -2159,7 +2162,7 @@ msgstr "Est"
 #. module: auction
 #: view:auction.dates:0
 msgid "Seller Commissions"
-msgstr ""
+msgstr "Comisiones vendedor"
 
 #. module: auction
 #: view:report.object.encoded:0
@@ -2169,7 +2172,7 @@ msgstr "Estadística objeto"
 #. module: auction
 #: help:auction.dates,journal_seller_id:0
 msgid "Account journal for seller"
-msgstr ""
+msgstr "Diario contable para vendedor"
 
 #. module: auction
 #: field:auction.dates,auction2:0
@@ -2179,7 +2182,7 @@ msgstr "Último día de subasta"
 #. module: auction
 #: view:auction.deposit:0
 msgid "Objects Description"
-msgstr ""
+msgstr "Descripción de objetos"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_pay_buy.py:0
@@ -2197,7 +2200,7 @@ msgstr "Descripción"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: auction
 #: field:auction.lots,obj_price:0
@@ -2217,12 +2220,12 @@ msgstr "Contraseña"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: auction
 #: view:auction.pay.buy:0
diff --git a/addons/auction/i18n/es_AR.po b/addons/auction/i18n/es_AR.po
index 8947d0fce92..6c8c55fcff8 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-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Lote"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/es_EC.po b/addons/auction/i18n/es_EC.po
index 18e07fab82b..a03504d67e6 100644
--- a/addons/auction/i18n/es_EC.po
+++ b/addons/auction/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-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr "Lote"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/et.po b/addons/auction/i18n/et.po
index 626a0d1b489..ce5dee2d53a 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Partii"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/fi.po b/addons/auction/i18n/fi.po
index 95120d82095..09963892cf4 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/fr.po b/addons/auction/i18n/fr.po
index 85cab263117..df6df8fc58a 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1463,8 +1463,8 @@ msgstr "Lot"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
-msgstr "Sous-categorie aie"
+msgid "children aie category"
+msgstr ""
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_artists
@@ -2800,3 +2800,6 @@ msgstr "Historique de la vente"
 
 #~ msgid "My Latest Objects"
 #~ msgstr "Mes Derniers Objets"
+
+#~ msgid "Childs aie category"
+#~ msgstr "Sous-categorie aie"
diff --git a/addons/auction/i18n/hi.po b/addons/auction/i18n/hi.po
index 6b0e6074df0..6bda3bdb87f 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/hr.po b/addons/auction/i18n/hr.po
index 19e144800b7..d7e4bfa425e 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Lot"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/hu.po b/addons/auction/i18n/hu.po
index 9f67c1054d8..2dd5dc150d1 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/id.po b/addons/auction/i18n/id.po
index 2316fe3ffcc..9536405ded7 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/it.po b/addons/auction/i18n/it.po
index 98c49d8d00b..9b9679534c1 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/ko.po b/addons/auction/i18n/ko.po
index af038719d5e..b291af1984b 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index dd9a50c8505..4fdd44bebd2 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 3eb1e3a63c8..a57a1db3fb5 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/nl_BE.po b/addons/auction/i18n/nl_BE.po
index 2bbec55a059..90fe294435b 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-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index ced65283c18..935dadf5510 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/pt.po b/addons/auction/i18n/pt.po
index ade7e1b1f66..63233d62152 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1452,7 +1452,7 @@ msgstr "Lote"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 6829c6e3e57..e3c543a9f53 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-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/ro.po b/addons/auction/i18n/ro.po
index a1996caab31..243b7bad4ab 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Lot"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/ru.po b/addons/auction/i18n/ru.po
index 3bdc3f0bbdb..e7885dea7a2 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Лот"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/sl.po b/addons/auction/i18n/sl.po
index a1459c7aa6a..a63c4db0aab 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/sq.po b/addons/auction/i18n/sq.po
index 694e708093b..d3e9b7e8083 100644
--- a/addons/auction/i18n/sq.po
+++ b/addons/auction/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-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/sr.po b/addons/auction/i18n/sr.po
index d0153cc8300..d40ed52b173 100644
--- a/addons/auction/i18n/sr.po
+++ b/addons/auction/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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1454,7 +1454,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/sr@latin.po b/addons/auction/i18n/sr@latin.po
index 3a72a5ba49f..277908ff7ee 100644
--- a/addons/auction/i18n/sr@latin.po
+++ b/addons/auction/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1454,7 +1454,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/sv.po b/addons/auction/i18n/sv.po
index 6d71af4e261..a0458a99d1a 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/tlh.po b/addons/auction/i18n/tlh.po
index aeddac9d2be..c9016eeff63 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-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index 620da9af390..f07c6534d31 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-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/uk.po b/addons/auction/i18n/uk.po
index 891737c3007..ad76cb7d132 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-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/vi.po b/addons/auction/i18n/vi.po
index 23a552be1e9..dba29659e88 100644
--- a/addons/auction/i18n/vi.po
+++ b/addons/auction/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-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index d3980519fda..2fe5e5f895f 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-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "批号"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/zh_TW.po b/addons/auction/i18n/zh_TW.po
index fe594967bae..cb052fdbceb 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-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/report/catalog2.xsl b/addons/auction/report/catalog2.xsl
index c44d0e83047..c44d0e83047 100755..100644
--- a/addons/auction/report/catalog2.xsl
+++ b/addons/auction/report/catalog2.xsl
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index 438524db44c..aba0421531e 100644
--- a/addons/audittrail/i18n/de.po
+++ b/addons/audittrail/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:56+0000\n"
+"PO-Revision-Date: 2010-12-28 09:06+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -55,7 +55,7 @@ msgstr "Audit Protokolle"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppierung..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -66,7 +66,7 @@ msgstr "Status"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "Abonnieren"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -167,7 +167,7 @@ msgstr "Neuer Wert Text: "
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Search Audittrail Rule"
-msgstr ""
+msgstr "Suche Aufzeichnungsregel"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
@@ -231,6 +231,15 @@ msgid ""
 "    delete on objects and can check logs.\n"
 "    "
 msgstr ""
+"\n"
+"    Dieses Modul gibt dem Administrator das Recht\n"
+"    für jeden Benutzer sämtliche Aktivitäten für alle\n"
+"    Objekte des Systems zu verfolgen.\n"
+"\n"
+"     Der Administrator kann exakte Regeln für die Protokollierung\n"
+"     von Lese, Schreib, Erstell- und Löschvorgängen definieren und diese\n"
+"     dann rückwirkend überprüfen oder nachvollziehen.\n"
+"    "
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
@@ -299,7 +308,7 @@ msgstr "Feld Beschreibung"
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Search Audittrail Log"
-msgstr ""
+msgstr "Suche in Aktivitätenaufzeichnung"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index 1e5c54bf9fc..aa8dba18a00 100644
--- a/addons/audittrail/i18n/es.po
+++ b/addons/audittrail/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 19:37+0000\n"
+"PO-Revision-Date: 2010-12-27 09:26+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index 2ac31525f2e..4a63d9ac84c 100644
--- a/addons/base_action_rule/i18n/de.po
+++ b/addons/base_action_rule/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 15:00+0000\n"
+"PO-Revision-Date: 2010-12-28 09:17+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -389,7 +389,7 @@ msgstr "%(object_description)s = Objekt Beschreibung"
 #. module: base_action_rule
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Fehler: Email wurde nicht ausreichend konfiguriert"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
diff --git a/addons/base_action_rule/i18n/el.po b/addons/base_action_rule/i18n/el.po
new file mode 100644
index 00000000000..f5e9694dbb3
--- /dev/null
+++ b/addons/base_action_rule/i18n/el.po
@@ -0,0 +1,498 @@
+# Greek 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: 2010-12-21 19:43+0000\n"
+"PO-Revision-Date: 2010-12-28 18:21+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr ""
+"Τσέκαε αυτό εάν θέλετε αυτός ο κανόνας να στέλνει email στον/στην υπεύθυνο."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Υπενθύμιση Συνεργάτη"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Κατηγορία Συνεργάτη"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Το Κουμπί Πατήθηκε"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Αντικείμενο"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Αποστολή σε αυτά τα Emails"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Θέσε την κατάσταση σε"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "Email Από"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "Σώμα Email"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Ημέρες"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:0
+#, python-format
+msgid "Error!"
+msgstr "Σφάλμα!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Απάντηση-Σε"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Λεπτά"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Όνομα Κανόνα"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Create actions automatically triggered based on a user activity in the "
+"system.E.g.: an opportunity created by a specific user can be automatically "
+"maintained with a specific sales team, or an opportunity which still has "
+"status pending after 14 days triggers an automatic reminder email."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Προσθεσμία"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Συνεργάτης"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Κατάσταση"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr "Κανόνας Ενέργειας"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Πεδία προς Αλλαγή"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Ημερομηνία Δημιουργίας"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Τελευταία Ημερομηνία Ενέργειας"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Ώρες"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(object_id)s = Object ID"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Καθυστέρηση Μετά την Ημερομηνία Εναύσματος"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Υπενθύμιση με Συννημένο"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Μη έγκυρες παράμετροι"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Κανένας"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "Τύπος καθυστέρησης"
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "Email Σε"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Σημείωση"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Καθυστέρηση μετά την ημερομηνίας εναύσματος"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Συνθήκες"
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Ενεργό"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:0
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Μήνες"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Φίλτρο"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Ημερομηνία"
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Σφάλμα:Το email δεν είναι σωστά διαμορφωμένο"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Υπεύθυνος"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "Σώμα Mail"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr "Αυτοματοποιημένες ενέργειες"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Ενέργεια Διακομιστή"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Ακολουθία"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Ενέργειες"
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Ημερομηνία Δημιουργίας"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Ημερομηνία Εναύσματος"
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po
index 81da8224174..9163cd8aec2 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 19:31+0000\n"
+"PO-Revision-Date: 2010-12-27 09:29+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_calendar/i18n/de.po b/addons/base_calendar/i18n/de.po
index ee344bdd1b6..1b8dcf12e83 100644
--- a/addons/base_calendar/i18n/de.po
+++ b/addons/base_calendar/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 12:13+0000\n"
+"PO-Revision-Date: 2010-12-28 07:56+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -47,6 +47,8 @@ msgstr ""
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Das ausgewählte Unternehmen gehört nicht zu den zulässigen Unternehmen für "
+"diesen Benutzer"
 
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
@@ -788,7 +790,7 @@ msgstr "Fr"
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Count can not be Negative"
-msgstr ""
+msgstr "Zahl kann nicht negativ sein"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -1021,7 +1023,7 @@ msgstr "Mittwoch"
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Interval can not be Negative"
-msgstr ""
+msgstr "Intervall kann nicht negativ sein"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
@@ -1115,7 +1117,7 @@ msgstr "Wiederk. Vorgang"
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Sie können nicht zwei identische Benutzeranmeldungen definieren!"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
diff --git a/addons/base_calendar/i18n/el.po b/addons/base_calendar/i18n/el.po
index ac030965910..d0c450a2d71 100644
--- a/addons/base_calendar/i18n/el.po
+++ b/addons/base_calendar/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-16 17:59+0000\n"
+"PO-Revision-Date: 2010-12-28 18:15+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -70,7 +70,7 @@ msgstr "Προσκαλούμενος Χρήστης"
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "Select range to Exclude"
-msgstr ""
+msgstr "Επιλογή εύρους για Εξαίρεση"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
@@ -189,7 +189,7 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
 msgid "Basic Alarm"
-msgstr ""
+msgstr "Βασική Υπενθύμιση"
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
@@ -609,7 +609,7 @@ msgstr "Ημερήσια"
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Can not Duplicate"
-msgstr ""
+msgstr "Δεν μπορεί να Διπλοκαταχωρηθεί"
 
 #. module: base_calendar
 #: field:calendar.event,class:0
@@ -694,7 +694,7 @@ msgstr "Δεκέμβριος"
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,send_mail:0
 msgid "Check this if you want to send an Email to Invited Person"
-msgstr ""
+msgstr "Τσέκαρε αυτό εάν θέλετε να στείλετε Email στον Προσκεκλημένο"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -778,7 +778,7 @@ msgstr "Επαφές"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "Βασικές Πληροφορίες Υπενθύμισης"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,fr:0
@@ -849,12 +849,12 @@ msgstr "Γεγονότα"
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
 #: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
 msgid "Invite Attendees"
-msgstr ""
+msgstr "Πρόσληση Συμμετοχόντων"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr ""
+msgstr "Email του Προσκεκλημένου"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -937,7 +937,7 @@ msgstr "Νοέμβριος"
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr ""
+msgstr "Δηλώνει τις ομάδες που ο προσκεκλημένος ανήκει"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
@@ -976,7 +976,7 @@ msgstr "Οκτώβριος"
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Αβέβαιο"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
@@ -1170,7 +1170,7 @@ msgstr "Ακύρωση"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
@@ -1230,13 +1230,13 @@ msgstr "Υπεύθυνος"
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Επανάληψη"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
 #: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
 msgid "Event Invitations"
-msgstr ""
+msgstr "Προσκλήσεις Γεγονότος"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
@@ -1361,14 +1361,14 @@ msgstr "Αντικείμενα"
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr ""
+msgstr "Ανατέθηκε"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Σάβ"
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -1383,47 +1383,47 @@ msgstr ""
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Minutely"
-msgstr ""
+msgstr "Κάθε λεπτό"
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
-msgstr ""
+msgstr "Όρισε τον χρήστη που δρα εκ μέρους του χρήστη ημερολογίου"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Ημερομηνία Λήξης"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "February"
-msgstr ""
+msgstr "Φεβρουάριος"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Months"
-msgstr ""
+msgstr "Μήνες"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr ""
+msgstr "Πόρος"
 
 #. module: base_calendar
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr ""
+msgstr "Όνομα"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Εξαίρεση Ημερομηνία/Ώρες"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1431,6 +1431,8 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
+"Περιλαμβάνει το κείμενο που θα χρησιμοποιηθεί σαν θέμα μυνήματος για email ή "
+"περιλαμβάνει το κείμενο για προβολή"
 
 #. module: base_calendar
 #: field:calendar.event,alarm_id:0
@@ -1438,7 +1440,7 @@ msgstr ""
 #: field:calendar.todo,alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Υπενθύμιση"
 
 #. module: base_calendar
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
@@ -1449,122 +1451,122 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr ""
+msgstr "Αποστάλθηκε από Χρήστη"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "April"
-msgstr ""
+msgstr "Απρίλιος"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Καθημερινή"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Κατά ημέρα"
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Μοντέλο"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr ""
+msgstr "Ήχος"
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr ""
+msgstr "Για Λόγους πληροφόρησης"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Invite"
-msgstr ""
+msgstr "Προσκαλέστε"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Πληροφορίες Συμμετέχοντα"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "ID Πόρου"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr ""
+msgstr "Απαιτεί ενέργεια"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr ""
+msgstr "Στάλθηκε Από"
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Ακολουθία"
 
 #. module: base_calendar
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Βάλε υπενθύμιση στην συγκεκριμένη ώρα, πρίν συμβεί το γεγονός"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Internal User"
-msgstr ""
+msgstr "Εσωτερικός Χρήστης"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Accept"
-msgstr ""
+msgstr "Αποδοχή"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Σάββατο"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
-msgstr ""
+msgstr "Πρόσκληση Σε"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Δευτερόλεπτο"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "Ελεύθερο/Απασχολημένο"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1575,7 +1577,7 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Διάρκεια"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
@@ -1583,11 +1585,13 @@ msgid ""
 "Create specific calendar alarms that can be assigned to calendar events or "
 "meetings."
 msgstr ""
+"Δημιουργεία συγκεκριμένων υπενθυμήσεων ημερολογίου που μπορούν να ανατεθούνε "
+"σε γεγονότα ημερολογίου ή συναντήσεις."
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Ημερομηνία Εναύσματος"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1605,7 +1609,7 @@ msgstr ""
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Πέμπτος"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Μη έγκυρο XML για προβολή Αρχιτεκτονικής"
diff --git a/addons/base_calendar/i18n/es.po b/addons/base_calendar/i18n/es.po
index 0e9263dbb68..f8252d39c91 100644
--- a/addons/base_calendar/i18n/es.po
+++ b/addons/base_calendar/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: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 13:46+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:44+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -248,7 +248,7 @@ msgstr "Estado de la participación de los asistentes"
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Room"
-msgstr ""
+msgstr "Sala"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -621,49 +621,49 @@ msgstr "Marcar como"
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_address_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: base_calendar
 #: help:calendar.event,rrule_type:0
 #: help:calendar.todo,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "Permite que el evento se repita automáticamente en ese intervalo"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegar"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,partner_id:0
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Contactos de la empresa"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Aceptar"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "First"
-msgstr ""
+msgstr "Primera"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacidad"
 
 #. module: base_calendar
 #: field:calendar.event,vtimezone:0
@@ -674,21 +674,21 @@ msgstr "Zona horaria"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "Asunto"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,send_mail:0
@@ -698,81 +698,81 @@ msgstr "Marque aquí si quiere enviar un correo a la persona invitada"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr ""
+msgstr "Disponibilidad"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "_Save"
-msgstr ""
+msgstr "_Guardar"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr ""
+msgstr "Individual"
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Dueño"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegation Info"
-msgstr ""
+msgstr "Información delegación"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha inicio"
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr ""
+msgstr "Nombre común"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr ""
+msgstr "Rechazada"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "My Role"
-msgstr ""
+msgstr "Mi rol"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr ""
+msgstr "Mis eventos"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Decline"
-msgstr ""
+msgstr "Rechazar"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Semanas"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr ""
+msgstr "Grupo"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Edit All"
-msgstr ""
+msgstr "Editar todo"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactos"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
@@ -784,7 +784,7 @@ msgstr "Información sobre la alarma básica"
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Vie"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -795,29 +795,29 @@ msgstr "La cuenta no puede ser negativa"
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr ""
+msgstr "Miembro"
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Ubicación del evento"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Regla recurrente"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr ""
+msgstr "Adjunto"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -828,7 +828,7 @@ msgstr "Invitación desde"
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
 msgid "Reminder"
-msgstr ""
+msgstr "Recordatorio"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
@@ -842,7 +842,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr ""
+msgstr "Eventos"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
@@ -859,7 +859,7 @@ msgstr "Email del invitado"
 #: field:calendar.alarm,repeat:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr ""
+msgstr "Repetir"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -873,65 +873,65 @@ msgstr ""
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Lunes"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Tercero"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_date:0
 #: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
 msgid "Event Date"
-msgstr ""
+msgstr "Fecha evento"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "The"
-msgstr ""
+msgstr "El"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr ""
+msgstr "Delegado desde"
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
@@ -941,65 +941,65 @@ msgstr "Indicar los grupos a los que pertenece el asistente"
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Data"
-msgstr ""
+msgstr "Datos"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Lun"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,count:0
 #: field:calendar.event,count:0
 #: field:calendar.todo,count:0
 msgid "Count"
-msgstr ""
+msgstr "Total"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "No repetir"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Incierto"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr ""
+msgstr "Disparadores"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr ""
+msgstr "Relacionado con"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,interval:0
@@ -1008,14 +1008,14 @@ msgstr ""
 #: field:calendar.todo,interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Intervalo"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Miércoles"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -1027,7 +1027,7 @@ msgstr "El intervalo no puede ser negativo"
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumen"
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
@@ -1035,17 +1035,17 @@ msgstr ""
 #: field:calendar.todo,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation"
-msgstr ""
+msgstr "Invitación"
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr ""
+msgstr "Acción"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
@@ -1059,6 +1059,8 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
+"Duración' y 'Repetir' son ambos opcionales, pero si uno está activo también "
+"debe estarlo el otro"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
@@ -1083,14 +1085,14 @@ msgstr "Define la acción a invocar cuando salte la alarma"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "Buscar eventos"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Semanal"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1101,17 +1103,19 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Si el campo activo es verdadero, le permitirá ocultar la notificación de "
+"aviso del evento sin eliminarlo."
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "ID fecha recurrente"
 
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1121,7 +1125,7 @@ msgstr ""
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: base_calendar
 #: view:res.alarm:0
@@ -1131,55 +1135,55 @@ msgstr "Detalles del recordatorio"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "A revisar"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,freq:0
 #: field:calendar.event,freq:0
 #: field:calendar.todo,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Frecuencia"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 #: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.usuarios"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Martes"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr ""
+msgstr "Procedimiento"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1192,7 +1196,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Usuario responsable"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1200,19 +1204,19 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Busy"
-msgstr ""
+msgstr "Ocupado"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr ""
+msgstr "Evento de calendario"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Tentative"
-msgstr ""
+msgstr "Provisional"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1220,39 +1224,39 @@ msgstr ""
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Recurrencia"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
 #: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
 msgid "Event Invitations"
-msgstr ""
+msgstr "Invitaciones al evento"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Jueves"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Custom"
-msgstr ""
+msgstr "Personalizado"
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Regla de excepción"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
@@ -1263,7 +1267,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr ""
+msgstr "Detalles"
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
@@ -1272,13 +1276,15 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Define una regla o patrón de repetición de tiempo a excluir de la regla "
+"recurrente."
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
@@ -1293,6 +1299,9 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Define una regla o patrón repetitivo para eventos recurrentes.\n"
+"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
@@ -1307,20 +1316,20 @@ msgstr ""
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,type:0
 #: view:calendar.attendee:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1331,41 +1340,41 @@ msgstr "Buscar invitaciones"
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr ""
+msgstr "Después de"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr ""
+msgstr "ir.valores"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Invite People"
-msgstr ""
+msgstr "Invitar personas"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
-msgstr ""
+msgstr "Objetos"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr ""
+msgstr "Delegada"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Sáb"
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -1380,7 +1389,7 @@ msgstr ""
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Minutely"
-msgstr ""
+msgstr "Cada minuto"
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
@@ -1391,36 +1400,36 @@ msgstr ""
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Fecha final"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Months"
-msgstr ""
+msgstr "Meses"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurso"
 
 #. module: base_calendar
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Fecha/horas excepción"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1428,6 +1437,8 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
+"Contiene el texto a usar como asunto del mensaje para correos electrónicos, "
+"o contiene el texto a mostrar"
 
 #. module: base_calendar
 #: field:calendar.event,alarm_id:0
@@ -1435,7 +1446,7 @@ msgstr ""
 #: field:calendar.todo,alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarma"
 
 #. module: base_calendar
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
@@ -1454,37 +1465,37 @@ msgstr "Enviado por usuario"
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Día de la semana"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Por día"
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Modelo"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr ""
+msgstr "Audio"
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
@@ -1499,17 +1510,17 @@ msgstr "Invitar"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Información asistentes"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "ID del recurso"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr ""
+msgstr "Necesita acción"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
@@ -1520,49 +1531,49 @@ msgstr "Enviado por"
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: base_calendar
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Internal User"
-msgstr ""
+msgstr "Usuario interno"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Accept"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Sábado"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
-msgstr ""
+msgstr "Invitación a"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Segundo"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "Libre/Ocupado"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1573,7 +1584,7 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duración"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
@@ -1585,7 +1596,7 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Fecha activación"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
diff --git a/addons/base_contact/i18n/de.po b/addons/base_contact/i18n/de.po
index 8fb3c8b26d0..7fc2ba1024d 100644
--- a/addons/base_contact/i18n/de.po
+++ b/addons/base_contact/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-09 10:02+0000\n"
+"PO-Revision-Date: 2010-12-28 08:44+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -45,7 +45,7 @@ msgstr "Beschäftigt seit"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Wählen Sie eine Option für die Adressenübernahme"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
@@ -130,6 +130,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Wenn dieses Feld deaktiviert wird, kann der Partnerkontakt  ausgeblendet "
+"werden."
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -154,6 +156,28 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"        Dieses Modul erlaubt Ihnen ein ganzheitliches und zentrales Kontakt- "
+"und Adressdatenmanagement.\n"
+"\n"
+"        Sie können folgende Kontaktdaten definieren:\n"
+"         * Kontakte ohne besonderen Bezug einem Partner,\n"
+"         * Kontakte mit verschiedenen Adressen (möglicherweise bei "
+"verschiedenen Partnern),\n"
+"         * Kontakte mit möglicherweise unterschiedlichen Funktionen (bei "
+"unterschiedlichen Adressen)\n"
+"\n"
+"     Weiterhin werden auch neue Menüpunkte durch das Modul generiert, und "
+"zwar\n"
+"         Partnerverzeichnis \\ Kontakte\n"
+"         Partnerverzeichnis \\ Partner Kontaktanrede\n"
+"\n"
+"     Beachten Sie, dass dieses Modul bereits vorhandene Adressen umwandelt "
+"in \"Adressen + Kontakte\". Dieses bedeutet, \n"
+"     dass einige Felder bei der Adresse fehlen werden (wie z.B. der Namen "
+"des Kontaktpartners), da diese durch den Einsatz\n"
+"     dieses Moduls in einem anderen Objekt zu definieren werden müssen.\n"
+"    "
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
@@ -261,7 +285,7 @@ msgstr "Partner Adressen"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Migration Adressverzeichnis zu Kontaktdaten"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -328,7 +352,7 @@ msgstr ""
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -481,7 +505,7 @@ msgstr "Bezeichnung"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
-msgstr ""
+msgstr "Sie können die aktuelle Partneradresse für den Kontakt übernehmen"
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
diff --git a/addons/base_contact/i18n/el.po b/addons/base_contact/i18n/el.po
index f75818be675..19af00aee40 100644
--- a/addons/base_contact/i18n/el.po
+++ b/addons/base_contact/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-15 05:05+0000\n"
+"PO-Revision-Date: 2010-12-28 17:16+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -47,7 +47,7 @@ msgstr "Ημερομηνία έναρξης εργασίας"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Επιλέξτε αυτήν την Επιλογή για Μετάπτωση Διευθύνσεων"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
@@ -132,6 +132,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Εάν το ενεργό πεδίο είναι Λάθος(False), σας επιτρέπει να αποκρύψετε την "
+"επαφή συναργάτη χωρίς να την διαγράψετε."
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -184,6 +186,8 @@ msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
 msgstr ""
+"Σειρά σπουδαιότητας αυτού του τίτλου εργασίας στην λίστα τιτλων εργασιω΄ν "
+"του συνδεδεμένου συνεργάτη"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -262,7 +266,7 @@ msgstr "Διευθύνσεις Συνεργάτη"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Μετάπτωση Διευθύνσεων σε Επαφές"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -326,7 +330,7 @@ msgstr "Αλλιώς οι λεπτομέρεις δεν θα είναι ορατ
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Παραμετροποίηση"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -469,7 +473,7 @@ msgstr "Εθνικότητα"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Ανοιχτές Εργασίες"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
@@ -480,6 +484,7 @@ msgstr "Όνομα"
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
 msgstr ""
+"Μπορείτε να μεταπτώσετε τις τρέχουσες διεύθυνσεις του Συνεργάτη στην επαφή."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
diff --git a/addons/base_contact/i18n/es.po b/addons/base_contact/i18n/es.po
index 5586c2473eb..28e6b64c00b 100644
--- a/addons/base_contact/i18n/es.po
+++ b/addons/base_contact/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:31+0000\n"
+"PO-Revision-Date: 2010-12-28 08:39+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -532,7 +532,7 @@ msgstr "Empresa a dirección"
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr "Fecha de inicio"
+msgstr "Fecha inicio"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
diff --git a/addons/base_contact/i18n/hu.po b/addons/base_contact/i18n/hu.po
index dc5152b00a5..0ed53e2584c 100644
--- a/addons/base_contact/i18n/hu.po
+++ b/addons/base_contact/i18n/hu.po
@@ -7,29 +7,29 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-05 07:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 20:32+0000\n"
+"Last-Translator: NOVOTRADE SYSTEMHOUSE <openerp@novotrade.hu>\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-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
 msgid "Title"
-msgstr ""
+msgstr "Megnevezés"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "# a kapcsolatoknak"
 
 #. module: base_contact
 #: field:res.partner.job,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -71,7 +71,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobil"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -82,12 +82,12 @@ msgstr ""
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
-msgstr ""
+msgstr "Emberek akikkel dolgozol"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr ""
+msgstr "Határozza meg a beosztást és címet"
 
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
@@ -104,17 +104,17 @@ msgstr ""
 #: view:res.partner.contact:0
 #: field:res.partner.job,name:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr ""
+msgstr "Feladatok ugyanahoz a partneri címhez"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr ""
+msgstr "Partnerek"
 
 #. module: base_contact
 #: field:res.partner.job,state:0
@@ -156,7 +156,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact"
-msgstr ""
+msgstr "Alap kapcsolat"
 
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
@@ -166,7 +166,7 @@ msgstr ""
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 msgid "Contact's Jobs"
-msgstr ""
+msgstr "Kapcsolattartó munkaköre"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -188,7 +188,7 @@ msgstr ""
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "Belső/Kimenő mellék a telefonszámhoz"
 
 #. module: base_contact
 #: help:res.partner.job,phone:0
@@ -199,7 +199,7 @@ msgstr ""
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr ""
+msgstr "Beosztások és címek"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
@@ -215,12 +215,12 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Partner sorrend"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "Címek"
 
 #. module: base_contact
 #: field:base.contact.installer,progress:0
@@ -247,7 +247,7 @@ msgstr ""
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr ""
+msgstr "múlt"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
@@ -289,7 +289,7 @@ msgstr ""
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
 msgid "Working and private addresses."
-msgstr ""
+msgstr "Munkahelyi és otthoni címek"
 
 #. module: base_contact
 #: help:res.partner.job,address_id:0
@@ -299,12 +299,12 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,function:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Partner beosztása"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Plusz telefon mező"
 
 #. module: base_contact
 #: field:res.partner.contact,website:0
@@ -325,7 +325,7 @@ msgstr ""
 #: field:res.partner.contact,email:0
 #: field:res.partner.job,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_base_contact_installer
@@ -335,12 +335,12 @@ msgstr ""
 #. module: base_contact
 #: view:res.partner.job:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Kapcsolatartók"
 
 #. module: base_contact
 #: field:res.partner.job,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -350,7 +350,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.contact,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktív"
 
 #. module: base_contact
 #: field:res.partner.contact,function:0
@@ -365,27 +365,27 @@ msgstr ""
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "sorrend"
 
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
 msgid "Language"
-msgstr ""
+msgstr "Nyelv"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Extra információ"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr ""
+msgstr "Cégek akikkel dolgozol"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Partneri kapcsolat"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -410,7 +410,7 @@ msgstr ""
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Aktuális"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
@@ -420,7 +420,7 @@ msgstr "Keresztnév"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr ""
+msgstr "Kapcsolattartó partner"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
@@ -436,7 +436,7 @@ msgstr ""
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Fő munkakör"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
@@ -446,18 +446,18 @@ msgstr ""
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr ""
+msgstr "Kapcsolat a tisztviselőhöz"
 
 #. module: base_contact
 #: view:res.partner:0
 #: field:res.partner.job,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Cím"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Nemzetiség"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
@@ -477,7 +477,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "Fő munkáltató"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
@@ -498,12 +498,12 @@ msgstr ""
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "Partner címe"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Indulási időpont"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
diff --git a/addons/base_contact/i18n/it.po b/addons/base_contact/i18n/it.po
index 3628e0bfd66..9fad16604a9 100644
--- a/addons/base_contact/i18n/it.po
+++ b/addons/base_contact/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-12 09:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:25+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -155,6 +155,25 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"        Questo modulo permette di gestire i vostri contatti interamente.\n"
+"\n"
+"    Permette di definire\n"
+"        * contatti non relazionati necessariamente con un partner,\n"
+"        * contatti che lavorano per parecchi indirizzi (possibilità per "
+"partner differenti),\n"
+"        * contatti con la possibilità di avere differenti funzioni per "
+"ognuno degli indirizzi lavorativi\n"
+"\n"
+"    Aggiunge inoltre un nuovo menù in:\n"
+"        Partner \\ Contatti\n"
+"        Partner \\ Funzioni\n"
+"\n"
+"    Prestare attenzione che questo modulo converte l'attuale indirizzo in "
+"\"indirizzo + contatti\". Ciò significa che alcuni campi dell'indirizzo "
+"verranno persi (come il nome contatto), dato che questi si suppongono "
+"definiti in un altro oggetto.\n"
+"    "
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
diff --git a/addons/base_contact/i18n/vi.po b/addons/base_contact/i18n/vi.po
index 5b9b212b8e3..c107618c451 100644
--- a/addons/base_contact/i18n/vi.po
+++ b/addons/base_contact/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 14:04+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:09+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -78,7 +78,7 @@ msgstr "Số di động"
 #: view:res.partner.contact:0
 #: field:res.partner.contact,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Các ghi chú"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index c82109d9b54..9ed0b1171bb 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -23,7 +23,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
-This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity
+This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.
 
     """,
     'author': 'OpenERP SA',
diff --git a/addons/base_iban/i18n/de.po b/addons/base_iban/i18n/de.po
index e615693cd4e..79a6136da4e 100644
--- a/addons/base_iban/i18n/de.po
+++ b/addons/base_iban/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 11:48+0000\n"
+"PO-Revision-Date: 2010-12-28 08:46+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -66,6 +66,12 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul bietet die Grundlage für die Verwaltung von IBAN (International "
+"Bank Account Number) Bankkonten inklusive Überprüfung auf Richtigkeit der "
+"Daten.\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
diff --git a/addons/base_iban/i18n/el.po b/addons/base_iban/i18n/el.po
index 0d0126d9180..0d5a4bf6cd0 100644
--- a/addons/base_iban/i18n/el.po
+++ b/addons/base_iban/i18n/el.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2009-05-14 15:09+0000\n"
-"Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
+"PO-Revision-Date: 2010-12-28 19:54+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -18,7 +18,7 @@ msgstr ""
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr ""
+msgstr "Δημιουργία λογαριασμών IBAN"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:0
@@ -27,6 +27,7 @@ msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
 msgstr ""
+"Ο IBAN δεν φαίνεται να είναι σωστός. Θα πρέπει να είχατε εισάγει κάτι σαν %s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -41,7 +42,7 @@ msgstr "Διεθνής Αριθμός Τραπεζικού Λογαριασμο�
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Τραπεζικοί Λογαριασμοί"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
@@ -62,6 +63,11 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Αυτό το άρθρωμα κάνει εγκατάσταση την βάση για το IBAN (International Bank "
+"Account Number) λογαριασμού τράπεζας και ελέγχει για την ορθότητά του\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
@@ -73,6 +79,7 @@ msgstr "iban"
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
 msgstr ""
+"Ο IBAN δεν είναι έγκυρος, θα πρέπει να ξεκινά με τον κωδικό της χώρας"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
diff --git a/addons/base_iban/i18n/es.po b/addons/base_iban/i18n/es.po
index 624bd4e1b94..05e4392c6dd 100644
--- a/addons/base_iban/i18n/es.po
+++ b/addons/base_iban/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:18+0000\n"
+"PO-Revision-Date: 2010-12-27 09:14+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_module_quality/i18n/el.po b/addons/base_module_quality/i18n/el.po
index 0bc9f730d2f..d5772b06a07 100644
--- a/addons/base_module_quality/i18n/el.po
+++ b/addons/base_module_quality/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-08-03 03:39+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 20:06+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -22,7 +22,7 @@ msgstr ""
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:0
 #, python-format
 msgid "Suggestion"
-msgstr ""
+msgstr "Πρόταση"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:0
@@ -34,7 +34,7 @@ msgstr ""
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Method Test"
-msgstr ""
+msgstr "Μεθοδολογία Τεστ"
 
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
@@ -64,13 +64,13 @@ msgstr "Προσπεράστηκε"
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Module has no objects"
-msgstr ""
+msgstr "Το Άρθρωμα δεν έχει αντικείμενα"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Speed Test"
-msgstr ""
+msgstr "Τεστ Ταχύτητας"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
@@ -87,13 +87,13 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "Object Name"
-msgstr ""
+msgstr "Όνομα Αντικειμένου"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Ok"
-msgstr ""
+msgstr "ΟΚ"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
@@ -107,7 +107,7 @@ msgstr ""
 #: code:addons/base_module_quality/wizard/quality_save_report.py:0
 #, python-format
 msgid "No report to save!"
-msgstr ""
+msgstr "Καμία αναφορά για αποθήκευση!"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:0
@@ -128,7 +128,7 @@ msgstr ""
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
 msgid "Result (/10)"
-msgstr ""
+msgstr "Αποτέλεσμα(/10)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
@@ -140,7 +140,7 @@ msgstr ""
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Object Test"
-msgstr ""
+msgstr "Τεστ Αντικειμένου"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -158,13 +158,13 @@ msgstr "Έλεγχος ποιότητας"
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Not Efficient"
-msgstr ""
+msgstr "αναπαρκής"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Προειδοποίηση"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
@@ -204,7 +204,7 @@ msgstr "Συντελεστής"
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Result of Security in %"
-msgstr ""
+msgstr "Αποτελέσματα Ασφάλειας σε %"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -219,7 +219,7 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "No enough data"
-msgstr ""
+msgstr "Μη επαρκή δεδομένα"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
@@ -237,7 +237,7 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "No data"
-msgstr ""
+msgstr "Δεν υπάρχουν δεδομένα"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
@@ -261,7 +261,7 @@ msgstr ""
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
 #, python-format
 msgid "Result in %"
-msgstr ""
+msgstr "Αποτέλεσμα σε %"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
@@ -273,7 +273,7 @@ msgstr "Τυπικές εγγραφές"
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
 msgid "No python file found"
-msgstr ""
+msgstr "Δεν βρέθηκε αρχείο python"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
@@ -318,7 +318,7 @@ msgstr ""
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
 #, python-format
 msgid "Status"
-msgstr ""
+msgstr "Κατάσταση"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
@@ -355,7 +355,7 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "Module Name"
-msgstr ""
+msgstr "Όνομα Αρθρώματος"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
@@ -385,7 +385,7 @@ msgstr ""
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Exception"
-msgstr ""
+msgstr "Εξαίρεση"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:0
@@ -532,25 +532,25 @@ msgstr ""
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Field name"
-msgstr ""
+msgstr "Όνομα πεδίου"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Warning! Object has no demo data"
-msgstr ""
+msgstr "Προειδοποίηση! Το αντικείμενο δεν έχει πρόχειρα δεδομένα"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
 #, python-format
 msgid "Tag Name"
-msgstr ""
+msgstr "όνομα ετικέτας"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
@@ -635,13 +635,13 @@ msgstr "Περίληψη"
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
 #, python-format
 msgid "File Name"
-msgstr ""
+msgstr "Όνομα Αρχείου"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:0
 #, python-format
 msgid "Line number"
-msgstr ""
+msgstr "Αριθμός Γραμμής"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
diff --git a/addons/base_module_quality/i18n/es.po b/addons/base_module_quality/i18n/es.po
index d391dbe2e74..9d43b3958a1 100644
--- a/addons/base_module_quality/i18n/es.po
+++ b/addons/base_module_quality/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:20+0000\n"
+"PO-Revision-Date: 2010-12-27 09:16+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_record/i18n/de.po b/addons/base_module_record/i18n/de.po
index 2de858f4c17..cb02a47eb88 100644
--- a/addons/base_module_record/i18n/de.po
+++ b/addons/base_module_record/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:15+0000\n"
+"PO-Revision-Date: 2010-12-28 11:02+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -297,6 +297,34 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die einfache Erstellung eines neuen Moduls ohne "
+"Quellcode zu schreiben.\n"
+"Es werden alle Vorgänge zu ausgewählten Objekten während einer aktiven "
+"Sitzung aufgezeichnet, um\n"
+"dann ein Modul in Form eines .zip Archivs zu exportieren. Somit können Sie "
+"sehr einfach Ihr eigenes \n"
+"Modul mit Hilfe des OpenERP Clients erstellen.\n"
+"\n"
+"Aufgezeichnet werden neu erstellte und/oder geänderte Datensätze. Außerdem "
+"werden \n"
+"abhängige Daten sowie existierende Verbindungen aktualisiert (many2one "
+"Widgets, many2many Widgets, ...). \n"
+"Workflows und Demo/Update Daten werden ebenfalls im Rahmen dieses Moduls "
+"unterstützt.\n"
+"\n"
+"Diese Funktion hilft Ihnen z.B. dabei wiederverwendbare Module zu erstellen "
+"und auf diesem Wege individuelle\n"
+"Konfigurationen zu erstellen und diese für Demos bzw. den realen Einsatz zu "
+"nutzen. \n"
+"\n"
+"Wie sollte das Modul angewendet werden? Starten Sie den Assistenten über das "
+"Menü: \n"
+"Administration/Personalisierung/Export Personalisierung/Export "
+"Personalisierung als Modul\n"
+"Wählen Sie dann eine Datum/Zeit Einstellung für den Export der "
+"aufgezeichneten Personalisierung.\n"
+"    "
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/base_module_record/i18n/el.po b/addons/base_module_record/i18n/el.po
index 92b950fc7ec..b0323fc05ab 100644
--- a/addons/base_module_record/i18n/el.po
+++ b/addons/base_module_record/i18n/el.po
@@ -6,13 +6,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-12 09:18+0000\n"
+"PO-Revision-Date: 2010-12-28 18:32+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -247,7 +247,7 @@ msgstr "Πληροφορίες Αρθρώματος"
 #: wizard_field:base_module_record.module_record_data,init,info_yaml:0
 #: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
 msgid "YAML"
-msgstr ""
+msgstr "YAML"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,info,res_text:0
diff --git a/addons/base_module_record/i18n/es.po b/addons/base_module_record/i18n/es.po
index e4b4a40470b..ea798289ccf 100644
--- a/addons/base_module_record/i18n/es.po
+++ b/addons/base_module_record/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:50+0000\n"
+"PO-Revision-Date: 2010-12-27 09:19+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_report_creator/i18n/de.po b/addons/base_report_creator/i18n/de.po
index a252525b8f6..1c2543d6cbe 100644
--- a/addons/base_report_creator/i18n/de.po
+++ b/addons/base_report_creator/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 15:52+0000\n"
+"PO-Revision-Date: 2010-12-28 11:09+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -145,6 +145,7 @@ msgstr "Summe"
 #: constraint:base_report_creator.report:0
 msgid "You must have to give calendar view's color,start date and delay."
 msgstr ""
+"Sie müssen zum Kalender die Farbe angegeben, Startdatum und Laufzeit."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
@@ -246,6 +247,8 @@ msgstr "UND"
 #: constraint:base_report_creator.report:0
 msgid "You can not display field which are not stored in Database."
 msgstr ""
+"Sie können kein Feld anzeigen, welches nicht in der Datenbank gespeichert "
+"wird."
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
@@ -384,6 +387,7 @@ msgstr "Abbrechen"
 #: constraint:base_report_creator.report:0
 msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
+"Sie können keine Summenfunktion bei nicht berechenbaren Feldern anwenden."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -416,6 +420,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the report "
 "without removing it."
 msgstr ""
+"Durch Deaktivierung der Option, kann die Auswertung ausgeblendet werden."
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index 9d39bba8a61..88f4d9d5a81 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -36,8 +36,7 @@ upload the report using the same wizard.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['security/base_report_security.xml',
-                 'wizard/base_report_design_view.xml'],
+    'init_xml': ['wizard/base_report_design_view.xml'],
     'update_xml': ['base_report_designer_installer.xml'],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/base_report_designer/i18n/de.po b/addons/base_report_designer/i18n/de.po
index cd5090bb172..7b31724648d 100644
--- a/addons/base_report_designer/i18n/de.po
+++ b/addons/base_report_designer/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 18:19+0000\n"
+"PO-Revision-Date: 2010-12-28 11:12+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -25,7 +25,7 @@ msgstr ""
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "OpenERP Report Designer Configuration"
-msgstr ""
+msgstr "Konfiguration Report Designer"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
@@ -38,6 +38,8 @@ msgid ""
 "This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
 "Writer."
 msgstr ""
+"Dieses Plugin erlaubt es Berichte für OpenERP in Openoffice Writer zu "
+"erstellen oder zu verändern"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -56,6 +58,14 @@ msgid ""
 "you can modify in OpenOffice.Once you have modified it you can\n"
 "upload the report using the same wizard.\n"
 msgstr ""
+"\n"
+"Dieses Modul wird mit dem OpenERP OpenOffice Plugin benutzt.\n"
+"Sie müssen zunächst das Plugin installieren (http://www.openerp.com)\n"
+"\n"
+"Dieses Modul fügt einen Assistenten für den Import/Export von .swx \n"
+"Dateien hinzu, die Sie dann in OpenOffice bearbeiten können. Nach dem \n"
+"bearbeiten können Sie den Bericht auch mit diesem Assistenten wieder\n"
+"hochladen.\n"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
diff --git a/addons/base_report_designer/i18n/es.po b/addons/base_report_designer/i18n/es.po
index 31c3044fdbd..36f5c8abc67 100644
--- a/addons/base_report_designer/i18n/es.po
+++ b/addons/base_report_designer/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:54+0000\n"
+"PO-Revision-Date: 2010-12-27 09:08+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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 31ce7556bef..0cf581b1e14 100644
--- a/addons/base_report_designer/i18n/fr.po
+++ b/addons/base_report_designer/i18n/fr.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2009-11-09 16:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-28 08:27+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\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-12-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
 msgid "base.report.sxw"
-msgstr ""
+msgstr "base.report.sxw"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "OpenERP Report Designer Configuration"
-msgstr ""
+msgstr "Configuration du concepteur de rapports d'OpenERP"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
@@ -64,32 +64,32 @@ msgstr "Rapport .SXW"
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_designer_installer
 msgid "base_report_designer.installer"
-msgstr ""
+msgstr "base_report_designer.installer"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,description:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Fermer"
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "The RML report"
-msgstr ""
+msgstr "Le rapport RML"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "title"
-msgstr ""
+msgstr "titre"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
@@ -100,7 +100,7 @@ msgstr "Rapport"
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_rml_save
 msgid "base.report.rml.save"
-msgstr ""
+msgstr "base.report.rml.save"
 
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
@@ -110,7 +110,7 @@ msgstr "Concepteur de rapports"
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nom du fichier"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -122,7 +122,7 @@ msgstr "Recevoir un rapport"
 #: view:base_report_designer.installer:0
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
-msgstr ""
+msgstr "Concepteur de rapports d'OpenERP"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -132,7 +132,7 @@ msgstr "Continuer"
 #. module: base_report_designer
 #: field:base.report.rml.save,file_rml:0
 msgid "Save As"
-msgstr ""
+msgstr "Enregistrer sous"
 
 #. module: base_report_designer
 #: help:base_report_designer.installer,plugin_file:0
@@ -144,7 +144,7 @@ msgstr ""
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "Save RML FIle"
-msgstr ""
+msgstr "Sauvegarder le fichier RML"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,file_sxw:0
@@ -155,12 +155,12 @@ msgstr "Votre fichier .sxw"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Étapes d'installation et de configuration"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progression de la Configuration"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -174,32 +174,32 @@ msgstr ""
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Ignorer"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Image"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
 msgid "Base Report sxw"
-msgstr ""
+msgstr "Base des rapports SXW"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_file_sxw
 msgid "base.report.file.sxw"
-msgstr ""
+msgstr "base.report.file.sxw"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,plugin_file:0
 msgid "OpenObject Report Designer Plug-in"
-msgstr ""
+msgstr "Greffon de conception de rapports OpenObject"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
-msgstr ""
+msgstr "Installation du concepteur de rapports OpenERP"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -211,7 +211,7 @@ msgstr "Annuler"
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
index c51602cd82d..77314929269 100644
--- a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
+++ b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
@@ -26,7 +26,7 @@ OpenERP SXW2RML - The OpenERP's report engine
 
 OpenERP SXW2RML is part of the OpenERP Report Project.
 OpenERP Report is a module that allows you to render high quality PDF document
-from an OpenOffice template (.sxw) and any relationnal database.
+from an OpenOffice template (.sxw) and any relationl database.
 """
 __version__ = '0.9'
 
@@ -251,8 +251,8 @@ class DomApi(DomApiGeneral):
             parent = self.style_dict[style_name].getAttribute("style:parent-style-name").encode("utf-8")
             res = self.getStylePropertiesDict(parent)
 
-        childs = self.style_dict[style_name].childNodes
-        for c in childs:
+        children = self.style_dict[style_name].childNodes
+        for c in children:
             if c.nodeType == c.ELEMENT_NODE and c.nodeName.find("properties")>0 :
                 for attr in c._attrs.keys():
                     res[attr] = c.getAttribute(attr).encode("utf-8")
diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/plugin/openerp_report_designer.zip
index 50524b2e60d..47ca560e47d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer.zip
+++ b/addons/base_report_designer/plugin/openerp_report_designer.zip
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile b/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile
index d3a55804819..d3a55804819 100755..100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh b/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh
index a22ff96cf53..a22ff96cf53 100755..100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index 123be9b9bc2..3cf759e7ada 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -140,28 +140,16 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
             ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
             self.win.endExecute()
         try:
-
-            ids  = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' ,  'search', [('name','=','OpenOfficeReportDesigner')])
             ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
-            dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users'])
         except :
             import traceback,sys
             info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
             self.logobj.log_write('ServerParameter', LOG_ERROR, info)
 
-        if not len(ids) :
-            ErrorDialog("Group Not Found!!!  Create a group  named  \n\n"'"OpenOfficeReportDesigner"'"  \n\n  ","","Group Name Error")
-            self.logobj.log_write('Group Error',LOG_WARNING, ':Create a  group OpenOfficeReportDesigner   using database %s' % (sDatabase))
-            self.win.endExecute()
         if not len(ids_module):
             ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
             self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in  database %s' % (sDatabase))
             self.win.endExecute()
-
-        if UID not in dict_groups[0]['users']:
-            ErrorDialog("Connection Refuse...","You have not access these Report Designer")
-            self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ")
-            self.win.endExecute()
         else:
             desktop=getDesktop()
             doc = desktop.getCurrentComponent()
diff --git a/addons/base_report_designer/security/base_report_security.xml b/addons/base_report_designer/security/base_report_security.xml
deleted file mode 100644
index bd3854ebdba..00000000000
--- a/addons/base_report_designer/security/base_report_security.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data noupdate="1">
-		<record id="res_groups_openofficereportdesigner0" model="res.groups">
-			<field eval="[(6,0,[])]" name="menu_access"/>
-			<field eval="[(6,0,[])]" name="rule_groups"/>
-			<field eval="[(6,0,[ref('base.user_root')])]" name="users"/>
-			<field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
-		</record>
-
-       <record id="ir_model_access_openofficereportdesigner0" model="ir.model.access">
-           <field name="model_id" ref="base.model_ir_actions_report_xml"/>
-           <field eval="1" name="perm_read"/>
-           <field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
-           <field eval="1" name="perm_unlink"/>
-           <field eval="1" name="perm_write"/>
-           <field eval="1" name="perm_create"/>
-           <field name="group_id" ref="res_groups_openofficereportdesigner0"/>
-       </record>
-	</data>
-
-</openerp>
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index 1493766bf36..f81b2df7a4e 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:42+0000\n"
+"PO-Revision-Date: 2010-12-27 08:23+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+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 98af6bd0d13..3ef986711a8 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 04:36+0000\n"
+"PO-Revision-Date: 2010-12-27 16:41+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -177,6 +177,8 @@ msgid ""
 "Your company information will be used to personalize documents issued with "
 "OpenERP such as invoices, sales orders and much more."
 msgstr ""
+"La información de su compañía se usará para personalizar los documentos "
+"emitidos con OpenERP, como las facturas, pedidos y mucho más."
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -206,6 +208,21 @@ msgid ""
 "    footer, the account chart to install and the language.\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo implementa un sistema de configuración que ayuda al usuario\n"
+"    a configurar el sistema durante la instalación de una nueva base de "
+"datos.\n"
+"\n"
+"    Le permite seleccionar entre una lista de perfiles a instalar:\n"
+"    * Perfil mínimo\n"
+"    * Sólo contabilidad\n"
+"    * Compañías de servicios\n"
+"    * Compañías de fabricación\n"
+"\n"
+"    También proporciona pantallas para ayudarle a configurar fácilmente su "
+"compañía, la cabecera y el pie de página, el plan contable a instalar y el "
+"idioma.\n"
+"    "
 
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
@@ -334,6 +351,9 @@ msgid ""
 "Select the Applications you want your system to cover. If you are not sure "
 "about your exact needs at this stage, you can easily install them later."
 msgstr ""
+"Escoja las aplicaciones que desea cubrir con su sistema. Si no está seguro "
+"acerca de sus necesidades exactas en este punto, puede instalarlas "
+"fácilmente más tarde."
 
 #. module: base_setup
 #: view:base.setup.company:0
diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml
index f161d6c31ea..f161d6c31ea 100755..100644
--- a/addons/base_synchro/base_synchro_view.xml
+++ b/addons/base_synchro/base_synchro_view.xml
diff --git a/addons/base_synchro/i18n/de.po b/addons/base_synchro/i18n/de.po
index d5ddf158876..75dea07f52f 100644
--- a/addons/base_synchro/i18n/de.po
+++ b/addons/base_synchro/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:47+0000\n"
+"PO-Revision-Date: 2010-12-28 11:14+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_synchro
@@ -170,7 +170,7 @@ msgstr "Synchronisierte Instanzen"
 #. module: base_synchro
 #: field:base.synchro.obj,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
diff --git a/addons/base_synchro/i18n/es.po b/addons/base_synchro/i18n/es.po
index c5dffc8938a..4d9393d0d18 100644
--- a/addons/base_synchro/i18n/es.po
+++ b/addons/base_synchro/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 20:20+0000\n"
+"PO-Revision-Date: 2010-12-27 09:15+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_synchro
diff --git a/addons/base_vat/i18n/de.po b/addons/base_vat/i18n/de.po
index 295cf6abffa..b2db17365c9 100644
--- a/addons/base_vat/i18n/de.po
+++ b/addons/base_vat/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 11:39+0000\n"
+"PO-Revision-Date: 2010-12-28 11:16+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -40,6 +40,14 @@ msgid ""
 "countries.\n"
 "    "
 msgstr ""
+"\n"
+"    Aktivieren Sie die UST-ID für den Partner. Prüfen Sie die Gültigkeit.\n"
+"\n"
+"    Dieses Modul verwendet die Logik, die unter  http://sima-pc.com/nif.php "
+"beschrieben wird,\n"
+"    zur Prüfung der Gültigkeit einer UST-ID, die Sie bei einem "
+"Geschäftspartner aus der EU zuweisen.\n"
+"    "
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
@@ -51,7 +59,7 @@ msgstr ""
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:0
diff --git a/addons/base_vat/i18n/hu.po b/addons/base_vat/i18n/hu.po
index 74857cfdf00..6dea494d2fb 100644
--- a/addons/base_vat/i18n/hu.po
+++ b/addons/base_vat/i18n/hu.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: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-12-28 20:34+0000\n"
+"Last-Translator: NOVOTRADE SYSTEMHOUSE <openerp@novotrade.hu>\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-12-24 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -64,7 +64,7 @@ msgstr ""
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
diff --git a/addons/board/i18n/de.po b/addons/board/i18n/de.po
index 0de6b36d3e4..5d97f21a745 100644
--- a/addons/board/i18n/de.po
+++ b/addons/board/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 15:59+0000\n"
+"PO-Revision-Date: 2010-12-28 11:17+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -229,7 +229,7 @@ msgstr "Obermenü"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Monat -1    "
 
 #. module: board
 #: selection:res.log.report,month:0
diff --git a/addons/board/i18n/es.po b/addons/board/i18n/es.po
index c568a3392fd..dae2d4b1569 100644
--- a/addons/board/i18n/es.po
+++ b/addons/board/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 21:06+0000\n"
+"PO-Revision-Date: 2010-12-27 09:22+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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 a310d388127..3b8fa7ace2c 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/i18n/fr.po
@@ -7,20 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-04 10:01+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-28 09:04+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\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-12-24 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Année  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
@@ -86,7 +85,7 @@ msgstr "Tableau"
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "Activité hebdomadaire globale"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -96,13 +95,13 @@ msgstr "Titre"
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "Nombre d'entrées"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "mois"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
@@ -114,7 +113,7 @@ msgstr "Ouvrir le Tableau de Bord"
 #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
 #: view:res.log.report:0
 msgid "Monthly Activity per Document"
-msgstr ""
+msgstr "Activité mensuelle par document"
 
 #. module: board
 #: view:res.log.report:0
@@ -130,23 +129,23 @@ msgstr "Définition du Tableau de Bord"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "mars"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "août"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "Connexions utilisateur"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Date de création"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
@@ -162,7 +161,7 @@ msgstr "Menu Information"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "juin"
 
 #. module: board
 #: field:board.note,type:0
@@ -188,18 +187,18 @@ msgstr "Date"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "juillet"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres étendus..."
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Jour"
 
 #. module: board
 #: view:board.menu.create:0
@@ -209,12 +208,12 @@ msgstr "Créer un Menu pour le Tableau de Bord"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "février"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "octobre"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
@@ -234,7 +233,7 @@ msgstr ""
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "janvier"
 
 #. module: board
 #: view:board.note:0
@@ -244,7 +243,7 @@ msgstr "Notes"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "novembre"
 
 #. module: board
 #: help:board.board.line,sequence:0
@@ -258,7 +257,7 @@ msgstr ""
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "avril"
 
 #. module: board
 #: view:board.board:0
@@ -277,7 +276,7 @@ msgstr "Module de base pour tous les Tableaux de Bord"
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Action"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -287,7 +286,7 @@ msgstr "Position"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Modèle"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
@@ -323,7 +322,7 @@ msgstr "Largeur"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   mois   "
 
 #. module: board
 #: field:board.board.line,sequence:0
@@ -333,12 +332,12 @@ msgstr "Séquence"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "septembre"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "décembre"
 
 #. module: board
 #: view:board.board:0
@@ -359,18 +358,18 @@ msgstr "Créer un Menu Tableau"
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "mai"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Objet"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "année"
 
 #. module: board
 #: view:board.menu.create:0
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 0110e1678ae..f073975d79a 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -4,4 +4,4 @@
 "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
 "access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1
-
+"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1
diff --git a/addons/caldav/i18n/de.po b/addons/caldav/i18n/de.po
index cf86f8cd445..42010ac6e99 100644
--- a/addons/caldav/i18n/de.po
+++ b/addons/caldav/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:53+0000\n"
+"PO-Revision-Date: 2010-12-28 11:31+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
@@ -57,7 +57,7 @@ msgstr "Teilnehmer"
 #. module: caldav
 #: sql_constraint:basic.calendar.fields:0
 msgid "Can not map a field more than once"
-msgstr ""
+msgstr "Das Feld kann nur einmal zugewiesen werden."
 
 #. module: caldav
 #: selection:basic.calendar,type:0
@@ -224,6 +224,31 @@ msgid ""
 "created\n"
 "        CALENDAR_NAME: Name of calendar to access\n"
 msgstr ""
+"\n"
+"    Dieses Modul beinhaltet die Basisfunktionen für ein caldav "
+"Kalendersystem:  \n"
+"  - WebDav Server, für den Remote Zugriff auf einen Kalender\n"
+"  - Synchronisation von Kalendern durch CalDav Nutzung\n"
+"  - Individuelle Konfiguration der Attribute Termin und Aufgabe für alle "
+"OpenERP Objekte\n"
+"  - Bereitstellung von ical Import/Export Funktionalität\n"
+"\n"
+"    Für einen Zugriff auf Kalender durch CalDav fähige Anwendungen, "
+"verwenden Sie folgende Adresse:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    Für einen Remote Zugriff auf OpenERP Kalender via WebCal verwenden Sie "
+"folgendes Adressmuster:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      wobei folgendes gilt:\n"
+"        HOSTNAME: Host auf dem der OpenERP Server (mit WebDav) läuft\n"
+"        PORT: Port auf dem der OpenERP Server läuft (Standard: 8069)\n"
+"        DATABASE_NAME: Name der Datenbank mit dem erstellten OpenERP "
+"Kalender\n"
+"        CALENDAR_NAME: Name des Kalenders, der verbunden werden soll\n"
 
 #. module: caldav
 #: field:basic.calendar,create_date:0
@@ -269,12 +294,15 @@ msgstr "Kalender"
 msgid ""
 "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
 msgstr ""
+"Bitte installieren Sie python-vobject von "
+"http://vobject.skyhouseconsulting.com/"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_import.py:0
 #, python-format
 msgid "Invalid format of the ics, file can not be imported"
 msgstr ""
+"Ungültiges Format der .ics Datei. Diese Datei kann nicht importiert werden."
 
 #. module: caldav
 #: field:basic.calendar.fields,field_id:0
diff --git a/addons/caldav/i18n/es.po b/addons/caldav/i18n/es.po
index 838b021e9bd..36a9a3b7056 100644
--- a/addons/caldav/i18n/es.po
+++ b/addons/caldav/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 22:14+0000\n"
+"PO-Revision-Date: 2010-12-27 09:23+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
diff --git a/addons/claim_from_delivery/i18n/es.po b/addons/claim_from_delivery/i18n/es.po
index ad157efd575..3e3c0a97b15 100644
--- a/addons/claim_from_delivery/i18n/es.po
+++ b/addons/claim_from_delivery/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 21:08+0000\n"
+"PO-Revision-Date: 2010-12-27 08:36+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/it.po b/addons/claim_from_delivery/i18n/it.po
index 216cca22574..8218252b5a1 100644
--- a/addons/claim_from_delivery/i18n/it.po
+++ b/addons/claim_from_delivery/i18n/it.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-22 07:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:28+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
 msgid "Claim"
-msgstr ""
+msgstr "Reclamo"
 
 #. module: claim_from_delivery
 #: model:ir.module.module,description:claim_from_delivery.module_meta_information
 msgid "Create Claim from delivery order:\n"
-msgstr ""
+msgstr "Crea il reclamo dall'ordine di consegna:\n"
 
 #. module: claim_from_delivery
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
-msgstr ""
+msgstr "Reclamo da consegna"
 
 #~ msgid "Picking List"
 #~ msgstr "Picking List"
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 311822376eb..edfee9e7614 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -47,13 +47,12 @@ AVAILABLE_PRIORITIES = [
 class crm_case(object):
     """A simple python class to be used for common functions """
 
-    
     def _find_lost_stage(self, cr, uid, type, section_id):
         return self._find_percent_stage(cr, uid, 0.0, type, section_id)
         
     def _find_won_stage(self, cr, uid, type, section_id):
         return self._find_percent_stage(cr, uid, 100.0, type, section_id)
-    
+
     def _find_percent_stage(self, cr, uid, percent, type, section_id):
         """
             Return the first stage with a probability == percent
@@ -105,7 +104,6 @@ class crm_case(object):
         if not stage.on_change:
             return {'value':{}}
         return {'value':{'probability': stage.probability}}
-    
 
     def _get_default_partner_address(self, cr, uid, context=None):
 
@@ -208,7 +206,6 @@ class crm_case(object):
         next_stage = stage_pool.browse(cr, uid, next_stage_id, context=context)
         if not next_stage:
             return False
-            
         next_seq = next_stage.sequence
         if not current_seq :
             current_seq = 0
@@ -221,10 +218,8 @@ class crm_case(object):
     def stage_change(self, cr, uid, ids, context=None, order='sequence'):
         if context is None:
             context = {}
-            
         stage_pool = self.pool.get('crm.case.stage')
         stage_type = context and context.get('stage_type','')
-        
         current_seq = False
         next_stage_id = False
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a03ccb28fad..6c66dc94848 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -87,7 +87,8 @@
                         icon="terp-partner"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
-                        attrs="{'invisible':[('partner_id','!=',False)]}" />
+                        attrs="{'invisible':[('partner_id','!=',False)]}" 
+                        groups="base.group_partner_manager"/>
                     <newline/>
                     <field name="partner_address_id"
                         on_change="onchange_partner_address_id(partner_address_id, email_from)" />
@@ -165,7 +166,8 @@
                         icon="terp-partner"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
-                        attrs="{'invisible':[('partner_id','!=',False)]}" />
+                        attrs="{'invisible':[('partner_id','!=',False)]}"
+                        groups="base.group_partner_manager" />
                     <newline/>
                     <field name="partner_address_id"
                         on_change="onchange_partner_address_id(partner_address_id, email_from)" />
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index 5e733112b40..dbebd8232c3 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-14 23:10+0000\n"
+"PO-Revision-Date: 2010-12-28 11:39+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -383,7 +383,7 @@ msgstr "Ansprechpartner"
 #. module: crm
 #: view:crm.installer:0
 msgid "Enhance your core CRM Application with additional functionalities."
-msgstr ""
+msgstr "Erweitern Sie die CRM Anwendung durch zusätzliche Funktionen."
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -548,7 +548,7 @@ msgstr "Erstelle Verkaufschance"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -669,7 +669,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Claim"
-msgstr ""
+msgstr "Reklamation"
 
 #. module: crm
 #: constraint:base.action.rule:0
@@ -754,7 +754,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Arbeitszeit"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -2829,7 +2829,7 @@ msgstr "Prozess fortsetzen"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure Your CRM Application"
-msgstr ""
+msgstr "Konfigurieren Sie Ihre CRM Anwendung"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
@@ -3642,6 +3642,10 @@ msgid ""
 "them to easily track how is positioned a specific opportunity in the sales "
 "cycle."
 msgstr ""
+"Erstellen Sie spezifische Vertriebsstufen, deren Anwendung die Bearbeitung "
+"von Vertriebschancen erleichtert. Hilfreich ist die Angabe der Stufe für die "
+"Rückverfolgung von Verkaufsvorgängen sowie als zusätzliche Information zum "
+"Bearbeitungsstatus."
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 6d0d263546f..83f03f5d4f2 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 21:10+0000\n"
+"PO-Revision-Date: 2010-12-27 08:53+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+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 62b1465ecea..c07888b824d 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 13:20+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-28 22:50+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\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-12-24 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -38,7 +37,7 @@ msgstr "Besoin de services"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr "Mensuel"
+msgstr "Mensuelle"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
@@ -48,7 +47,7 @@ msgstr "Planifier un appel"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr "Etape des cas"
+msgstr ""
 
 #. module: crm
 #: view:crm.meeting:0
@@ -122,7 +121,7 @@ msgstr "Jour"
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr ""
+msgstr "Le code de l'équipe de vente doit être unique !"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -329,6 +328,8 @@ msgid ""
 "Create specific phone call categories to better sort the type of calls "
 "tracked in the system."
 msgstr ""
+"Créer une catégorie d'appels téléphoniques spécifique pour mieux trier le "
+"suivi des types d'appels dans le système."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -544,7 +545,7 @@ msgstr "Créer une opportunité"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -670,7 +671,7 @@ msgstr "Réclamation"
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Erreur : email mal formé."
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -751,7 +752,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Temps de travail"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -1197,6 +1198,8 @@ msgstr "_Annuler"
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
 msgstr ""
+"Les appels téléphoniques fermés ou annulés ne peuvent pas être convertis en "
+"opportunités."
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2545,6 +2548,10 @@ msgid ""
 "your partners to better manage your interactions with them. The segmentation "
 "tool will assign categories to partners based on defined criteria."
 msgstr ""
+"Créer des catégories de partenaires que vous serez alors en mesure "
+"d'affecter à vos partenaires afin de mieux gérer les interactions avec eux. "
+"L'outil de segmentation affecte des catégories aux partenaires en fonction "
+"des critères définis"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -2787,7 +2794,7 @@ msgstr "Continuer le processus"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure Your CRM Application"
-msgstr ""
+msgstr "Configurer l'application CRM"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
@@ -3458,7 +3465,7 @@ msgstr ""
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de membres associés récursifs."
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3633,7 +3640,7 @@ msgstr "A besoin de consultation"
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer des profils récursifs."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -3657,6 +3664,7 @@ msgstr "Date de l'identifiant récurrent"
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
 msgstr ""
+"Vous ne pouvez pas avoir deux utilisateurs avec le même identifiant !"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 86a19467964..64fb7ef84d3 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-24 09:40+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 18:01+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-12-24 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -662,7 +662,7 @@ msgstr ""
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Errore: La mail non è formattata correttamente"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1041,7 +1041,7 @@ msgstr "L'opportunità \"%s\" è stata chiusa."
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Giorni per l'apertura"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1072,6 +1072,8 @@ msgstr "Cellulare"
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
+"Non ci sono altre opportunità \"Aperte\" o \"In corso\" per il partner "
+"\"%s\"."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1196,7 +1198,7 @@ msgstr "Vinto"
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Scadenza superata"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
@@ -1366,7 +1368,7 @@ msgstr "Analisi telefonate"
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Data apertura"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
@@ -1458,7 +1460,7 @@ msgstr "Lunedì"
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Giorni per la chiusura"
 
 #. module: crm
 #: field:crm.add.note,attachment_ids:0
@@ -1511,7 +1513,7 @@ msgstr "Cerca"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "Opportunità per categorie"
 
 #. module: crm
 #: field:crm.meeting,interval:0
@@ -1537,7 +1539,7 @@ msgstr "Codice"
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Team figli"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1627,7 +1629,7 @@ msgstr "Invita persone"
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Errore! Non è possibile creare un team di vendita ricorsivo."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1757,7 +1759,7 @@ msgstr "Sabato"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Quinto"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
@@ -1808,12 +1810,12 @@ msgstr "Dettagli invito"
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Team padre"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Data prossima azione"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1952,7 +1954,7 @@ msgstr ""
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Opportunità per fase"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -2341,7 +2343,7 @@ msgstr "Attivo"
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "La fare dell'opportunità \"%s\" è cambiata a \"%s\"."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2356,7 +2358,7 @@ msgstr ">"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Non sicuro"
 
 #. module: crm
 #: field:crm.send.mail,email_cc:0
@@ -2508,7 +2510,7 @@ msgstr "Martedì"
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "Città"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
@@ -2567,7 +2569,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Lavoro principale"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2646,12 +2648,12 @@ msgstr ""
 #. module: crm
 #: field:crm.installer,thunderbird:0
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "# di email"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2663,7 +2665,7 @@ msgstr "Ricerca iniziative"
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Ritardo di apertura"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
@@ -2673,7 +2675,7 @@ msgstr "crm.lead"
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Giorno della settimana"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2708,7 +2710,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Telefonata al partner"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2752,7 +2754,7 @@ msgstr "Rispondi a"
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Dashboard vendite"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
@@ -2770,7 +2772,7 @@ msgstr "Numero di Casi"
 #: help:crm.meeting,section_id:0
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Team di vendita a cui il caso appartiene"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -2793,7 +2795,7 @@ msgstr "Invariato"
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr ""
+msgstr "Segmentazione dei partner"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2839,7 +2841,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "Nome Oggetto"
 
 #. module: crm
 #: help:crm.lead,email_from:0
@@ -2855,13 +2857,13 @@ msgstr ""
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Aggiungi nota interna"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "La fase dell'iniziativa \"%s\" è cambiata in \"%s\""
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -2873,12 +2875,12 @@ msgstr ""
 #: field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Messaggi"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid "Change Probability on next and previous stages."
-msgstr ""
+msgstr "Cambia la probabilità nella prossimo e nella precedente fase"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2891,7 +2893,7 @@ msgstr "Errore!"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exclude range"
-msgstr ""
+msgstr "Intervallo di esclusione"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2937,7 +2939,7 @@ msgstr "   Mese   "
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Collegamenti"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2975,7 +2977,7 @@ msgstr "# Mail"
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Attenzione"
 
 #. module: crm
 #: field:crm.phonecall,name:0
@@ -3056,7 +3058,7 @@ msgstr "Giorno del mese"
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Tasso di successo (%)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3067,7 +3069,7 @@ msgstr "Nuovo"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail TO"
-msgstr ""
+msgstr "Mail A"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3129,6 +3131,7 @@ msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
 msgstr ""
+"La data di scadenza è calcolata automaticamente dalla data inizio + durata"
 
 #. module: crm
 #: field:crm.lead,state_id:0
@@ -3138,7 +3141,7 @@ msgstr "Stato fed."
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Crea opportunità di business dall'iniziativa"
 
 #. module: crm
 #: help:crm.send.mail,html:0
@@ -3164,7 +3167,7 @@ msgstr ""
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Imposta categoria a"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -3206,7 +3209,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "Definizione fase"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -3223,7 +3226,7 @@ msgstr "Dicembre"
 #. module: crm
 #: field:crm.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Immagine"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -3327,12 +3330,12 @@ msgstr "Contatti"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Interessato ai Computer"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Dettagli Invito"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -3350,7 +3353,7 @@ msgstr ""
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Errore! Non è possibile creare dei membri associati ricorsivi."
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3374,7 +3377,7 @@ msgstr "Bozza"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Casi per Team di vendita"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3396,7 +3399,7 @@ msgstr "Riunione"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Categoria del caso"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3436,7 +3439,7 @@ msgstr "VIa (2)"
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+msgstr "Categorie Meeting"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -3472,7 +3475,7 @@ msgstr "Non è stata ritrovata email per il tuo indirizzo"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Opportunità per fase"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 18ba93d6501..eb2ba39f56e 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -196,23 +196,21 @@
 
 <!-- Leads by user and section Action -->
 
-        <record id="action_report_crm_lead" model="ir.actions.act_window">
-            <field name="name">Leads Analysis</field>
-            <field name="res_model">crm.lead.report</field>
-            <field name="view_type">form</field>
-            <field name="context">{'search_default_filter_lead': 1, 'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="domain">[('type', '=', 'lead')]</field>
-            <field name="help">Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
-        </record>
-
+       <record id="action_report_crm_lead" model="ir.actions.act_window">
+           <field name="name">Leads Analysis</field>
+           <field name="res_model">crm.lead.report</field>
+           <field name="view_type">form</field>
+           <field name="context">{'search_default_filter_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
+           <field name="view_mode">tree,graph</field>
+           <field name="domain">[]</field>
+           <field name="help">Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
+       </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>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 3f5620d9751..cbe3ec94c20 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -92,7 +92,8 @@
                         icon="terp-partner"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
-                        attrs="{'invisible':[('partner_id','!=',False)]}" />
+                        attrs="{'invisible':[('partner_id','!=',False)]}"
+                        groups="base.group_partner_manager" />
                     <newline/>
                     <field name="partner_address_id"
                         on_change="onchange_partner_address_id(partner_address_id, email_from)" />
diff --git a/addons/crm/scripts/php/xmlrpc.inc b/addons/crm/scripts/php/xmlrpc.inc
index 78ac897e2ce..78ac897e2ce 100755..100644
--- a/addons/crm/scripts/php/xmlrpc.inc
+++ b/addons/crm/scripts/php/xmlrpc.inc
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 6da8a168b21..b9f7dad6c07 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -14,7 +14,7 @@
         		<separator string="" colspan="4" />
 	      		<group col="4" colspan="4">
 	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      			<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
 	      		</group>
 	      	</form>
 	      </field>
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index d0e04576b3b..fa3a9fc4335 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -21,11 +21,11 @@
 
 
 {
-    'name': 'Extened Module to Add CalDav future on Meeting',
+    'name': 'Extended Module to Add CalDav feature on Meeting',
     'version': '1.1',
     'category': 'Generic Modules/CRM & SRM',
     'description': """
-    New Futures in Meeting:
+    New Features in Meeting:
         *  Share meeting with other calendar clients like sunbird
 """,
     'author': 'OpenERP SA',
diff --git a/addons/crm_caldav/i18n/de.po b/addons/crm_caldav/i18n/de.po
index 4454d7f4295..6034805dd1d 100644
--- a/addons/crm_caldav/i18n/de.po
+++ b/addons/crm_caldav/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 14:57+0000\n"
+"PO-Revision-Date: 2010-12-28 11:41+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_caldav
@@ -35,6 +35,10 @@ msgid ""
 "    New Futures in Meeting:\n"
 "        *  Share meeting with other calendar clients like sunbird\n"
 msgstr ""
+"\n"
+"    Neue Funktion für Termine:\n"
+"           * Veröffentlichen Sie Termine zwecks Zugriff durch andere "
+"Kalenderanwendungen (z.B. Sunbird)\n"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/crm_caldav/i18n/es.po b/addons/crm_caldav/i18n/es.po
index 6c7a1dd88d2..d5a6c61d8c4 100644
--- a/addons/crm_caldav/i18n/es.po
+++ b/addons/crm_caldav/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 22:25+0000\n"
+"PO-Revision-Date: 2010-12-27 08:42+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_caldav
diff --git a/addons/crm_caldav/i18n/it.po b/addons/crm_caldav/i18n/it.po
index 7c3f0759018..89fc439ac97 100644
--- a/addons/crm_caldav/i18n/it.po
+++ b/addons/crm_caldav/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-21 07:57+0000\n"
+"PO-Revision-Date: 2010-12-28 07:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_caldav
@@ -34,6 +34,9 @@ msgid ""
 "    New Futures in Meeting:\n"
 "        *  Share meeting with other calendar clients like sunbird\n"
 msgstr ""
+"\n"
+"    Nuove caratteristiche nei Meeting:\n"
+"        * Condivisione meeting con altri client calendario, come Sunbird\n"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/crm_claim/i18n/el.po b/addons/crm_claim/i18n/el.po
index 97c243aae15..c0697c74805 100644
--- a/addons/crm_claim/i18n/el.po
+++ b/addons/crm_claim/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-19 07:50+0000\n"
+"PO-Revision-Date: 2010-12-28 17:34+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
@@ -168,7 +168,7 @@ msgstr "Επαναφορά σε Πρόχειρο"
 #: field:crm.claim,date_deadline:0
 #: field:crm.claim.report,date_deadline:0
 msgid "Deadline"
-msgstr "Προθεσμεία"
+msgstr "Προσθεσμία"
 
 #. module: crm_claim
 #: view:crm.claim:0
diff --git a/addons/crm_claim/i18n/es.po b/addons/crm_claim/i18n/es.po
index 1da0750547c..1112c09ae82 100644
--- a/addons/crm_claim/i18n/es.po
+++ b/addons/crm_claim/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 22:36+0000\n"
+"PO-Revision-Date: 2010-12-27 09:09+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
diff --git a/addons/crm_claim/i18n/it.po b/addons/crm_claim/i18n/it.po
index 5cea2f96092..c72a368052f 100644
--- a/addons/crm_claim/i18n/it.po
+++ b/addons/crm_claim/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-08 08:23+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:16+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
@@ -31,12 +31,12 @@ msgstr "Ragguppato per..."
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsibilities"
-msgstr ""
+msgstr "Responsabilità"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Data prossima azione"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -51,7 +51,7 @@ msgstr "Ritardo per Chiusura"
 #. module: crm_claim
 #: field:crm.claim,resolution:0
 msgid "Resolution"
-msgstr ""
+msgstr "Risoluzione"
 
 #. module: crm_claim
 #: field:crm.claim,company_id:0
@@ -63,12 +63,12 @@ msgstr "Compagnia"
 #. module: crm_claim
 #: field:crm.claim,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Email osservatori"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "#Claim"
-msgstr "# Iniziative"
+msgstr "# Reclami"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
@@ -77,6 +77,9 @@ msgid ""
 "in the system. The stages define all the steps required for the resolution "
 "of a claim."
 msgstr ""
+"E' possibile creare fasi del reclamo per categorizzare lo stato di ogni "
+"reclamo entrato nel sistema. Le fasi definiscono tutti i passaggi richiesti "
+"per la risoluzione di un reclamo."
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -93,7 +96,7 @@ msgstr "Giorno"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Aggiungi nota interna"
 
 #. module: crm_claim
 #: help:crm.claim,section_id:0
@@ -105,7 +108,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Description"
-msgstr ""
+msgstr "Descrizione del reclamo"
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
@@ -115,7 +118,7 @@ msgstr "Messaggi"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim1
 msgid "Factual Claims"
-msgstr "Richiami reali"
+msgstr "Reclami reali"
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
@@ -141,7 +144,7 @@ msgstr "Contatto Partner"
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Data chiusura"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -168,7 +171,7 @@ msgstr "Reimposta come Bozza"
 #: field:crm.claim,date_deadline:0
 #: field:crm.claim.report,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Scadenza"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -182,7 +185,7 @@ msgstr "Partner"
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Preventive Action"
-msgstr ""
+msgstr "Azione preventiva"
 
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
@@ -204,44 +207,44 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Priorità"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Invia nuova E-mail"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Scadenza superata"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Minore"
 
 #. module: crm_claim
 #: field:crm.claim,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data creazione"
 
 #. module: crm_claim
 #: field:crm.claim,name:0
 msgid "Claim Subject"
-msgstr ""
+msgstr "Oggetto del reclamo"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
@@ -253,7 +256,7 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
@@ -263,7 +266,7 @@ msgstr "Fasi reclamo"
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
 msgid "Categories"
-msgstr ""
+msgstr "Categorie"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -271,7 +274,7 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -281,22 +284,22 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Dates"
-msgstr ""
+msgstr "Date"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mese - 1    "
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Contact"
-msgstr ""
+msgstr "Contatto"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Fasi"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
@@ -306,12 +309,12 @@ msgstr "Analisi reclami"
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Numero di giorni per chiudere il caso"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
 msgid "CRM Claim Report"
-msgstr ""
+msgstr "Report reclamo CRM"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
@@ -326,51 +329,51 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mese"
 
 #. module: crm_claim
 #: field:crm.claim,type_action:0
 #: field:crm.claim.report,type_action:0
 msgid "Action Type"
-msgstr ""
+msgstr "Tipo azione"
 
 #. module: crm_claim
 #: field:crm.claim,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Data Aggiornamento"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Commerciale"
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Valore reclami"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Anno  "
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -385,13 +388,13 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Bozza"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Basso"
 
 #. module: crm_claim
 #: field:crm.claim,date_closed:0
@@ -406,12 +409,12 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "In sospeso"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -422,32 +425,32 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC globale"
 
 #. module: crm_claim
 #: model:ir.module.module,shortdesc:crm_claim.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr ""
+msgstr "Gestione delle relazioni con Clienti e Fornitori"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefono"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utente"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
 msgid "Awaiting Response"
-msgstr ""
+msgstr "In attesa di risposta"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
@@ -457,12 +460,12 @@ msgstr "Categorie reclami"
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtri estesi..."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -472,12 +475,12 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Search"
-msgstr ""
+msgstr "Ricerca"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
 #. module: crm_claim
 #: model:ir.module.module,description:crm_claim.module_meta_information
@@ -489,11 +492,17 @@ msgid ""
 "automatically new claims based on incoming emails.\n"
 "    "
 msgstr ""
+"\n"
+"Questo modulo permette di tenere traccia dei reclami di clienti e "
+"fornitori.\n"
+"E' totalmente integrato con il supporto mail cosicché è possibile creare\n"
+"automaricamente nuovi reclami basandosi sulle mail in arrivo.\n"
+"    "
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -519,17 +528,17 @@ msgstr "Reclami"
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Corrective Action"
-msgstr ""
+msgstr "Azione correttiva"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Politiche reclami"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History"
-msgstr ""
+msgstr "Storico"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim
@@ -540,7 +549,7 @@ msgstr "Reclamo"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Attachments"
-msgstr ""
+msgstr "Allegati"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -558,7 +567,7 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Stato"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -575,7 +584,7 @@ msgstr ""
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -593,38 +602,38 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress"
-msgstr ""
+msgstr "In corso"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsabile"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
-msgstr ""
+msgstr "Attuale"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Details"
-msgstr ""
+msgstr "Dettagli"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Casi di studio e stime"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reply"
-msgstr ""
+msgstr "Rispondi"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
 msgid "Root Cause"
-msgstr ""
+msgstr "Causa principale"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -634,7 +643,7 @@ msgstr "Descrizione reclamo/azione"
 #. module: crm_claim
 #: field:crm.claim,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -645,17 +654,17 @@ msgstr "Cerca reclami"
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Team di vendita"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Resolution Actions"
-msgstr ""
+msgstr "Azione risolutiva"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
@@ -679,11 +688,19 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"Lo stato è impostato a \"Bozza\", quando il caso è creato.                   "
+"           \n"
+"Se il caso è in corso lo stato è impostato su \"Aperto\".                    "
+"          \n"
+"Quando il caso è finito, lo stato è impostato su \"Completato\".             "
+"                 \n"
+"Se il caso necessita di essere revisionato allora lo stato è impostato su "
+"\"In sospeso\"."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
@@ -693,22 +710,22 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "I miei casi(o)"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "Azioni"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -722,17 +739,20 @@ msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
 msgstr ""
+"Crea categorie di reclamo, per meglio gestire e classificare i vostri "
+"reclami. Qualche esempio di reclami può essere: azione preventiva, azione "
+"correttiva."
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data creazione"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Anno"
 
 #~ msgid "This Year"
 #~ msgstr "Anno attuale"
diff --git a/addons/crm_fundraising/i18n/de.po b/addons/crm_fundraising/i18n/de.po
index 9459138a37f..7d7baef8bed 100644
--- a/addons/crm_fundraising/i18n/de.po
+++ b/addons/crm_fundraising/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-26 23:32+0000\n"
+"PO-Revision-Date: 2010-12-28 11:42+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
@@ -266,7 +266,7 @@ msgstr "Email Mitarbeiter"
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Monat -1    "
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
diff --git a/addons/crm_fundraising/i18n/es.po b/addons/crm_fundraising/i18n/es.po
index b36466fe4fe..c3772351001 100644
--- a/addons/crm_fundraising/i18n/es.po
+++ b/addons/crm_fundraising/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 22:26+0000\n"
+"PO-Revision-Date: 2010-12-27 09:19+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
diff --git a/addons/crm_fundraising/i18n/fr.po b/addons/crm_fundraising/i18n/fr.po
index b00d5a961ab..ea26a13910c 100644
--- a/addons/crm_fundraising/i18n/fr.po
+++ b/addons/crm_fundraising/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-20 21:23+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-28 22:55+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\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-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
@@ -265,7 +265,7 @@ msgstr "Courriel de l'employé"
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mois -1    "
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
diff --git a/addons/crm_helpdesk/i18n/de.po b/addons/crm_helpdesk/i18n/de.po
index 7f15f25ed2b..b2b007f73e8 100644
--- a/addons/crm_helpdesk/i18n/de.po
+++ b/addons/crm_helpdesk/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-15 12:54+0000\n"
+"PO-Revision-Date: 2010-12-28 11:42+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -251,7 +251,7 @@ msgstr "Daten"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Monat -1    "
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
diff --git a/addons/crm_helpdesk/i18n/es.po b/addons/crm_helpdesk/i18n/es.po
index c403cc81bc7..99d5ee0a0bd 100644
--- a/addons/crm_helpdesk/i18n/es.po
+++ b/addons/crm_helpdesk/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:26+0000\n"
+"PO-Revision-Date: 2010-12-27 09:03+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_partner_assign/i18n/de.po b/addons/crm_partner_assign/i18n/de.po
index 010027e8e2c..93ad48beeb1 100644
--- a/addons/crm_partner_assign/i18n/de.po
+++ b/addons/crm_partner_assign/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 14:49+0000\n"
+"PO-Revision-Date: 2010-12-28 11:44+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_partner_assign
@@ -155,6 +155,11 @@ msgid ""
 "based on geolocalization.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul wird durch OpenERP SA für die geografische Zuordnung von "
+"Interessenten \n"
+"zu Partnern eingesetzt.\n"
+"    "
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -411,7 +416,7 @@ msgstr "Partner Geo - Lokalisierung"
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index da8510d7b2d..d203c1f2fc7 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_partner_assign/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:27+0000\n"
+"PO-Revision-Date: 2010-12-27 09:22+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_partner_assign
diff --git a/addons/crm_profiling/i18n/de.po b/addons/crm_profiling/i18n/de.po
index 550316b0a3e..49d12740bc8 100644
--- a/addons/crm_profiling/i18n/de.po
+++ b/addons/crm_profiling/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-15 12:01+0000\n"
+"PO-Revision-Date: 2010-12-28 12:22+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
@@ -42,6 +42,24 @@ msgid ""
 "since it's the same which has been renamed.\n"
 "    "
 msgstr ""
+"\n"
+"    Dieses Modul ermöglicht eine gezielte Segmentierung von "
+"Geschäftspartnern.\n"
+"    Hierzu wurde die bisherige Funktion der Erstellung von Kundenprofilen "
+"überarbeitet. Unter Verwendung der neuen\n"
+"    Funktionalität der Umfragen können Sie gezielt Fragen zu Fragebögen "
+"zusammenfassen und direkt bei einem \n"
+"    Partner anwenden.\n"
+"\n"
+"    Die neue Funktionalität ersetzt aufgrund sich überschneidender "
+"Funktionen die bisherige Segmentierungslogik.\n"
+"\n"
+"    Die entsprechenden Untermenüs finden Sie unterhalb von "
+"\"Verkauf/Automatische Aktionen/Partner Segmentierung\".\n"
+"\n"
+"    *Hinweis: Dieses Modul ist nicht Kompatibel mit dem bisherigen Modul für "
+"die Segmentierung.\n"
+"    "
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index 1f04715054f..9dae57cac5f 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 15:09+0000\n"
+"PO-Revision-Date: 2010-12-28 12:24+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
@@ -58,7 +58,7 @@ msgstr "Verwendung"
 #. module: decimal_precision
 #: sql_constraint:decimal.precision:0
 msgid "Only one value can be defined for each given usage!"
-msgstr ""
+msgstr "Es kann nur ein Wert für alle Anwendungsfälle hinterlegt werden"
 
 #. module: decimal_precision
 #: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
diff --git a/addons/decimal_precision/i18n/es_EC.po b/addons/decimal_precision/i18n/es_EC.po
new file mode 100644
index 00000000000..472ef3eea7b
--- /dev/null
+++ b/addons/decimal_precision/i18n/es_EC.po
@@ -0,0 +1,70 @@
+# Spanish (Ecuador) 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: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-27 16:31+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Dígitos"
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Precisión decimal"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy Definitions"
+msgstr "Definiciones de Precisión decimal"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Este modulo permite configurar la precisión de decimales que requiere en "
+"cada tipo de modelo: contabilidad, ventas, compras,...\n"
+"\n"
+"La precisión de decimales se configura por compañía.\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Uso"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr "¡Sólo se puede definir un valor para cada uso dado!"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Configuración precisión decimal"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "Precisión Decimal"
diff --git a/addons/decimal_precision/i18n/it.po b/addons/decimal_precision/i18n/it.po
index 41fc1c204c4..e4e17641de6 100644
--- a/addons/decimal_precision/i18n/it.po
+++ b/addons/decimal_precision/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-22 07:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:31+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
@@ -58,7 +58,7 @@ msgstr "Utilizzo"
 #. module: decimal_precision
 #: sql_constraint:decimal.precision:0
 msgid "Only one value can be defined for each given usage!"
-msgstr ""
+msgstr "Solo un valore può essere definito per ogni utilizzo dato!"
 
 #. module: decimal_precision
 #: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index 879de61634a..a967f2d2dec 100644
--- a/addons/delivery/i18n/de.po
+++ b/addons/delivery/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 11:38+0000\n"
+"PO-Revision-Date: 2010-12-28 12:30+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -40,7 +40,7 @@ msgstr "Nettogewicht"
 #. module: delivery
 #: view:stock.picking:0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Lieferauftrag"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:0
@@ -173,7 +173,7 @@ msgstr "Partner"
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Verkaufsauftrag"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -229,7 +229,7 @@ msgstr "Tarif"
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
-msgstr ""
+msgstr "Durch Deaktivierung können Sie die  Liefertarife ausblenden"
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -271,6 +271,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "carrier without removing it."
 msgstr ""
+"Durch Aktivierung dieses Feldes, können Sie diesen Frachtführer ausblenden."
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:0
@@ -303,6 +304,7 @@ msgstr "Los"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: delivery
 #: field:delivery.carrier,active:0
@@ -339,7 +341,7 @@ msgstr ""
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index 94f0495f1b6..6d9ea99df2e 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:07+0000\n"
+"PO-Revision-Date: 2010-12-27 09:23+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+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 0e5b243ea29..0e5a3ea5495 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-20 07:56+0000\n"
+"PO-Revision-Date: 2010-12-28 09:18+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -39,7 +39,7 @@ msgstr "Вес нетто"
 #. module: delivery
 #: view:stock.picking:0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Заказ на доставку"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:0
@@ -170,7 +170,7 @@ msgstr "Партнёр"
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Заказ на продажу"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -291,7 +291,7 @@ msgstr "Партия"
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
 
 #. module: delivery
 #: field:delivery.carrier,active:0
@@ -325,7 +325,7 @@ msgstr ""
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Вы должны назначить партию изделий для данной ТМЦ"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -381,7 +381,7 @@ msgstr ""
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid "<="
-msgstr ""
+msgstr "<="
 
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index df5e78894fd..cff66049d3b 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -311,13 +311,14 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
+                <xpath expr="/search/group[@string='Group By...']" position="attributes">
+                    <attribute name="groups">base.group_extended</attribute>
+                </xpath>
                 <filter string="Owner" position="replace">
                     <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-partner" domain="[]"
-
-                       context="{'group_by':'partner_id'}"  groups="base.group_extended"/>
+                    <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                 </filter>
+                </filter>
             </field>
     </record>
 
diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index 0fdc92c3c35..6b983b0d71a 100644
--- a/addons/document/i18n/de.po
+++ b/addons/document/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:28+0000\n"
+"PO-Revision-Date: 2010-12-28 12:38+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -221,7 +221,7 @@ msgstr "Änderungsdatum"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Konfiguration Knowledge"
 
 #. module: document
 #: view:ir.attachment:0
@@ -274,7 +274,7 @@ msgstr "Speicher"
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr ""
+msgstr "Konfiguration Datenverzeichnis"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -609,6 +609,8 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Parallel zur Eltern-Kind Beziehung wird durch diese ID ein spezieller "
+"Datensatz erstellt."
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -708,7 +710,7 @@ msgstr "Integrierte Dokumentenverwaltung"
 #. module: document
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
-msgstr ""
+msgstr "Wählen Sie die folgenden Ressourcen für eine automatische Anbindung."
 
 #. module: document
 #: view:ir.attachment:0
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index d7aba7cbde7..0422edba24e 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -25,3 +25,4 @@
 "access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
 "access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
 "access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
+"access_report_document_user_knowledgeuser","report.document.user knowledgeuser","document.model_report_document_user","base.group_document_user",1,0,0,0
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 65b17a52c51..7580a8831cf 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -386,7 +386,7 @@ class abstracted_fs(object):
     def rename(self, src, datacr):
         """ Renaming operation, the effect depends on the src:
             * A file: read, create and remove
-            * A directory: change the parent and reassign childs to ressource
+            * A directory: change the parent and reassign children to ressource
         """
         cr = datacr[0]
         try:
diff --git a/addons/document_ftp/i18n/de.po b/addons/document_ftp/i18n/de.po
index b6e56a4adbd..5340c2babba 100644
--- a/addons/document_ftp/i18n/de.po
+++ b/addons/document_ftp/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:50+0000\n"
+"PO-Revision-Date: 2010-12-28 12:48+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -32,6 +32,12 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"Zeigt die Netzwerk IP Adresse über die der OpenERP Server für Endbenutzer "
+"erreicht werden kann. Diese Adresse hängt ab von der Architektur des "
+"Netzwerks, und wird lediglich einen Einfluss auf die Anzeige der Adresse "
+"beim Benutzer haben. Das Format der Adresse ist HOST:PORT, wobei der "
+"Standard Host (localhost) lediglich gültig ist für einen direkten Zugriff "
+"vom Server selbst."
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
@@ -51,7 +57,7 @@ msgstr "Bild"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -104,7 +110,7 @@ msgstr "Abbrechen"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Configure FTP Server"
-msgstr ""
+msgstr "Konfigurieren FTP Server"
 
 #. module: document_ftp
 #: model:ir.module.module,shortdesc:document_ftp.module_meta_information
@@ -124,7 +130,7 @@ msgstr "Suche per FTP Dokument"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Konfiguration Knowledge"
 
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
diff --git a/addons/document_ftp/i18n/es.po b/addons/document_ftp/i18n/es.po
index ebdc1fd95c3..00b41791bbb 100644
--- a/addons/document_ftp/i18n/es.po
+++ b/addons/document_ftp/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:06+0000\n"
+"PO-Revision-Date: 2010-12-27 09:21+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/fr.po b/addons/document_ftp/i18n/fr.po
index 7d83a16501d..71b774e9678 100644
--- a/addons/document_ftp/i18n/fr.po
+++ b/addons/document_ftp/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 14:37+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-28 22:56+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -57,7 +56,7 @@ msgstr "Image"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
index 87c0fba318c..0554595dd1b 100644
--- a/addons/document_ftp/i18n/it.po
+++ b/addons/document_ftp/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-24 08:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:35+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -31,6 +31,11 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"Indica l'indirizzo di rete su cui i vostri server OpenERP possono essere "
+"disponibili all'utente finale. Questo dipende dalla topologia di rete e "
+"dalla configurazione, e interessa solamente i link visualizzati dagli "
+"utenti. Il formato è HOST:PORTA e il default host (localhost) è adatto "
+"solamente per l'accesso dal server su se stesso.."
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
@@ -50,7 +55,7 @@ msgstr "Immagine"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Indirizzo"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -105,7 +110,7 @@ msgstr "_Annulla"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Configure FTP Server"
-msgstr ""
+msgstr "Configura FTP server"
 
 #. module: document_ftp
 #: model:ir.module.module,shortdesc:document_ftp.module_meta_information
diff --git a/addons/document_ics/i18n/de.po b/addons/document_ics/i18n/de.po
index a9f0e72e492..104c1ffed44 100644
--- a/addons/document_ics/i18n/de.po
+++ b/addons/document_ics/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 15:26+0000\n"
+"PO-Revision-Date: 2010-12-28 12:51+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -93,6 +93,8 @@ msgstr "Terminkalender"
 msgid ""
 "OpenERP can create and pre-configure a series of integrated calendar for you."
 msgstr ""
+"OpenERP kann für Sie die Erstellung und Basiskonfiguration von integrierten "
+"Kalenderfunktionen übernehmen."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
@@ -200,6 +202,8 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Ermöglicht Ihnen eine Synchronisierung Ihrer OpenERP Kalender mit mobilen "
+"Geräten oder Outlook, Thunderbird, etc. ..."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
@@ -301,7 +305,7 @@ msgstr "Kategorien"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
diff --git a/addons/document_ics/i18n/es.po b/addons/document_ics/i18n/es.po
index d84d8e889b9..4eb311b838b 100644
--- a/addons/document_ics/i18n/es.po
+++ b/addons/document_ics/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:55+0000\n"
+"PO-Revision-Date: 2010-12-27 09:11+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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 4e72b2c5f3e..1c6d14275dd 100644
--- a/addons/document_ics/i18n/it.po
+++ b/addons/document_ics/i18n/it.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: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-22 07:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:44+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-12-24 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -22,6 +22,8 @@ msgid ""
 "Manages the supplier and customers claims,including your corrective or "
 "preventive actions."
 msgstr ""
+"Gestisce i reclami cliente e fornitore, incluso le azioni preventive o "
+"correttive"
 
 #. module: document_ics
 #: field:document.directory.content,object_id:0
@@ -72,6 +74,8 @@ msgid ""
 "The field of the                         object used in the filename. Has to "
 "be a unique identifier."
 msgstr ""
+"Il campo dell'oggetto utilizzato nel nome file. Deve essere un "
+"identificatore univoco."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -88,6 +92,8 @@ msgstr "Calendario Riunioni"
 msgid ""
 "OpenERP can create and pre-configure a series of integrated calendar for you."
 msgstr ""
+"OpenERP può creare e pre-configurare una serie di calendari integrati per "
+"voi."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
@@ -115,6 +121,9 @@ msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
 msgstr ""
+"Permette di tenere traccia e gestire le iniziative, che sono le richieste "
+"prevendita o i contatti, il vero primo contatto con una richiesta del "
+"cliente."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -147,6 +156,8 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Aiuta ad organizzare il processo di assunzione lavoratori: valutazione, "
+"incontro, integrazione email..."
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -179,6 +190,8 @@ msgid ""
 "Helps you to encode the result of a phone call or to plan a list of phone "
 "calls to process."
 msgstr ""
+"Aiuta a codificare il risultato di una chiamata telefonica o a pianificare "
+"una lista di chiamate da effettuare."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,document_ics:0
@@ -186,6 +199,8 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Vi permette di sincronizzare il calendario di OpenERP con il vostro "
+"telefono, outlook, Sunbird, iCal, ..."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
@@ -241,6 +256,8 @@ msgstr "Dominio"
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
+"Usato dalle compagnie per tenere traccia dei bug e le richieste di supporto "
+"su software"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -333,6 +350,8 @@ msgid ""
 "If set, a separate                         instance will be created for each "
 "record of Object"
 msgstr ""
+"Se impostato, una istanza separata verrà creata per ognuno dei record "
+"dell'oggetto"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index dd46d8959ae..7db6ce49d98 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -376,9 +376,9 @@ class openerp_dav_handler(dav_interface):
                     cr.close()
         return self.db_name_list
 
-    def get_childs(self, uri, filters=None):
+    def get_children(self,uri, filters=None):
         """ return the child objects as self.baseuris for the given URI """
-        self.parent.log_message('get childs: %s' % uri)
+        self.parent.log_message('get children: %s' % uri)
         cr, uid, pool, dbname, uri2 = self.get_cr(uri, allow_last=True)
 
         if not dbname:
@@ -395,7 +395,7 @@ class openerp_dav_handler(dav_interface):
                 fp = node.full_path()
                 if fp and len(fp):
                     fp = '/'.join(fp)
-                    self.parent.log_message('childs for: %s' % fp)
+                    self.parent.log_message('children for: %s' % fp)
                 else:
                     fp = None
                 domain = None
@@ -433,7 +433,7 @@ class openerp_dav_handler(dav_interface):
         except DAV_Error:
             raise
         except Exception, e:
-            self.parent.log_error("cannot get_childs: "+ str(e))
+            self.parent.log_error("cannot get_children: "+ str(e))
             raise
         finally:
             if cr: cr.close()
diff --git a/addons/document_webdav/i18n/de.po b/addons/document_webdav/i18n/de.po
index 5fbc5df4b12..a56a43021eb 100644
--- a/addons/document_webdav/i18n/de.po
+++ b/addons/document_webdav/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 15:15+0000\n"
+"PO-Revision-Date: 2010-12-28 13:04+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav
@@ -71,6 +71,26 @@ msgid ""
 "          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
 "          ; these options on\n"
 msgstr ""
+" Durch dieses Modul wird der WebDAV Server für gemeinsame Dokumente "
+"aktiviert.\n"
+"        Verwenden Sie einfach einen beliebigen Browser, um Remote auf "
+"Dokumentenanhänge zuzugreifen.\n"
+"\n"
+"        Nach der Installation kann der WebDAV Server durch eine [webdav] "
+"Sektion in der Server Konfiguration gesteuert werden.\n"
+"        Folgendermassen kann dann eine Konfiguration aussehen:\n"
+"        [webdav]\n"
+"        ; enable = True ; Bereitstellung von WebDAV über den http(s) "
+"servers\n"
+"        ; vdir = webdav ; Verzeichnis für WebDAV auf dem Server\n"
+"          ; dieser Standard Eintrag bedeutet dass WebDAV über\n"
+"          ; \"http://localhost:8069/webdav/\" erreicht werden kann\n"
+"        ; verbose = True ; Aktivieren von \"verbose messages of webdav\"\n"
+"        ; debug = True ; Aktivieren von \"debugging messages of webdav\"\n"
+"          ; Hinweis: since the messages are routed to the python logging, "
+"with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -100,6 +120,9 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Bitte installieren Sie PyWebDAV von hier:  "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_dir_props
diff --git a/addons/document_webdav/i18n/it.po b/addons/document_webdav/i18n/it.po
index d0b69abe463..14bbf6f7235 100644
--- a/addons/document_webdav/i18n/it.po
+++ b/addons/document_webdav/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-24 09:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:56+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav
@@ -47,7 +47,7 @@ msgstr "Queste proprietà verranno aggiunte alle richieste WebDAV"
 #: code:addons/document_webdav/webdav.py:0
 #, python-format
 msgid "PyWebDAV Import Error!"
-msgstr ""
+msgstr "PyWebDAV: errore importazione!"
 
 #. module: document_webdav
 #: model:ir.module.module,description:document_webdav.module_meta_information
@@ -70,6 +70,24 @@ msgid ""
 "          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
 "          ; these options on\n"
 msgstr ""
+" Con questo modulo, il server WebDAV per i documenti è attivato.\n"
+"        E' possibile usare qualsiasi browser compatibile per vedere da "
+"remoto gli allegati di OpenERP.\n"
+"\n"
+"        Dopo l'installazione, il server WebDAV può essere controllato da una "
+"sezione [webdav] nella configurazione del server.\n"
+"        Parametri configurazione server:\n"
+"        [webdav]\n"
+"        ; enable = True ; Server webdav sui server http(s) \n"
+"        ; vdir = webdav ; la directory alla quale il server si appoggia\n"
+"        ; questo valore di default significa che il server è\n"
+"        ; su \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Abilita la messaggistica dettagliata di  webdav\n"
+"        ; debug = True ; Attiva la modalità di debug di webdav\n"
+"        ; così i messaggi verranno girati al log di python, con \n"
+"        ; levello: \"debug\" e \"debug_rpc\" rispettivamente, è possibile "
+"lasciare\n"
+"        ; questa opzione attiva\n"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -99,6 +117,9 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Per favore installare PyWebDAV dall'indirizzo: "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_dir_props
@@ -145,12 +166,12 @@ msgstr "server WebDAV per Gestione Documentale"
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "La Cartella deve avere un padre o uno storage"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Search Document storage"
-msgstr ""
+msgstr "Ricerca deposito documenti"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
diff --git a/addons/document_webdav/i18n/pl.po b/addons/document_webdav/i18n/pl.po
new file mode 100644
index 00000000000..c9ced487dab
--- /dev/null
+++ b/addons/document_webdav/i18n/pl.po
@@ -0,0 +1,158 @@
+# 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: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-28 09:13+0000\n"
+"Last-Translator: OpenERP Administrators <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-12-29 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Błąd! Nie możesz tworzyć rekurencyjnych katalogów."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+msgid "Namespace"
+msgstr "Przestrzeń nazw"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "Właściwiości DAV"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "Te właściwości zostaną dodane do zgłoszeń WebDAV"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:0
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "Błąd importu PyWebDAV"
+
+#. module: document_webdav
+#: model:ir.module.module,description:document_webdav.module_meta_information
+msgid ""
+" With this module, the WebDAV server for the documents is activated.\n"
+"        You can then use any compatible browser to remotely see the "
+"attachments of OpenObject.\n"
+"\n"
+"        After installation, the webDAV server can be controlled by a "
+"[webdav] section in the server's config.\n"
+"        Server Configuration Parameter:\n"
+"        [webdav]\n"
+"        ; enable = True ; Serve webdav over the http(s) servers\n"
+"        ; vdir = webdav ; the directory that webdav will be served at\n"
+"          ; this default val means that webdav will be\n"
+"          ; on \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Turn on the verbose messages of webdav\n"
+"        ; debug = True ; Turn on the debugging messages of webdav\n"
+"          ; since the messages are routed to the python logging, with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
+msgstr ""
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "Katalog nie może być nadrzędny dla samego siebie !"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamiczny kontekst"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "Właściwości WebDAV"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "Nazwa katalogu musi być unikalna !"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:0
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_dir_props
+msgid "DAV properties for folders"
+msgstr "Właściwości DAV dla katalogów"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+msgid "Properties"
+msgstr "Właściwości"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+msgid "Name"
+msgstr "Nazwa"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+msgid "Value"
+msgstr "Wartość"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "Katalog"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "Kat"
+
+#. module: document_webdav
+#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
+msgid "WebDAV server for Document Management"
+msgstr "Serwer WebDAV do Zarządzania dokumentami"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "Katalog musi mieć katalog nadrzędny lub nazwę napędu."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Search Document storage"
+msgstr "Przeszukaj przestrzeń dokumentów"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+msgid "Substitute"
+msgstr "Subsytut"
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index 259061743db..4c21d123e8e 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 17:14+0000\n"
+"PO-Revision-Date: 2010-12-28 13:34+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -388,6 +388,9 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"Die EMail vom Konto %s ist fehlgeschlagen. Mögliche Ursache: Server "
+"Sendefehler\n"
+" Beschreibung:%s"
 
 #. module: email_template
 #: view:email.template:0
@@ -487,7 +490,7 @@ msgstr "Test Ausgehende Verbindung"
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 msgid "Mailbox"
-msgstr ""
+msgstr "Postfach"
 
 #. module: email_template
 #: help:email.template,reply_to:0
@@ -886,7 +889,7 @@ msgstr "Sende / Empfange"
 #. module: email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Personal Mails"
-msgstr ""
+msgstr "Persönliche EMails"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1019,6 +1022,8 @@ msgid ""
 "Server Send Error\n"
 "Description: %s"
 msgstr ""
+"Server Sendefehler\n"
+"Beschreibung:%s"
 
 #. module: email_template
 #: help:email.template,file_name:0
@@ -1144,7 +1149,7 @@ msgstr "Gesendet"
 #. module: email_template
 #: sql_constraint:email_template.account:0
 msgid "Another setting already exists with this email ID !"
-msgstr ""
+msgstr "Ein anderes Konto existiert bereits für diese Adresse !"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
@@ -1226,6 +1231,10 @@ msgid ""
 "emails.\n"
 "    "
 msgstr ""
+"\n"
+"    Das Modul EMail Template ist eine Extraktion der Erweiterung Power EMail "
+"zur Nutzung für den Mailversand.\n"
+"    "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index 24fcd873c6a..a74a6689f38 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-25 22:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 12:58+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -389,6 +389,8 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"Email dall'account: %s fallita. Probabile motivo: Errore invio server\n"
+" Descrizione: %s"
 
 #. module: email_template
 #: view:email.template:0
@@ -752,7 +754,7 @@ msgstr "Bozza"
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "Nome interno modello"
 
 #. module: email_template
 #: field:email.template,message_id:0
@@ -1254,7 +1256,7 @@ msgstr "email_template.account"
 #: field:email_template.preview,rel_model:0
 #: field:email_template.send.wizard,rel_model:0
 msgid "Model"
-msgstr ""
+msgstr "Modello"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
index e3f3401217c..e3f3401217c 100755..100644
--- a/addons/email_template/security/email_template_security.xml
+++ b/addons/email_template/security/email_template_security.xml
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index 6389ba9d96d..0448b8c58b5 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 14:12+0000\n"
+"PO-Revision-Date: 2010-12-28 13:44+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
@@ -648,6 +648,23 @@ msgid ""
 "event or per event category in:\n"
 "                Events / Reporting\n"
 msgstr ""
+"Organisation und Verwaltung von Veranstaltungen.\n"
+"\n"
+"    Durch dieses Modul können Sie unter anderem ...\n"
+"         * Veranstaltungen terminieren und Anmeldungen verwalten\n"
+"         * automatisch EMails für die Annahme und Bestätigung von "
+"Anmeldungen versenden \n"
+"         * ...\n"
+"     Eine Pinnwand für Organisationen mit folgenden Inhalten:\n"
+"        * Anmeldungen je Veranstaltung (Grafik)\n"
+"    Beachten Sie bitte folgendes:\n"
+"        - Sie können neue Veranstaltungstypen unter folgendem Menü "
+"definieren ...\n"
+"                               "
+"Veranstaltungen/Konfiguration/Veranstaltungstypen\n"
+"        - Vordefinierte Auswertungen über die Anzahl angemeldeter Benutzer "
+"nach Veranstaltung und Kategorie erhalten Sie hier:\n"
+"                               Veranstaltungen/Auswertungen\n"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
@@ -701,7 +718,7 @@ msgstr ""
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: event
 #: view:event.make.invoice:0
@@ -1098,7 +1115,7 @@ msgstr "Anmelden"
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  Anmeldung zu Veranstaltung "
 
 #. module: event
 #: help:event.event,date_begin:0
diff --git a/addons/event_project/i18n/de.po b/addons/event_project/i18n/de.po
index cc4edc141aa..6a85055167d 100644
--- a/addons/event_project/i18n/de.po
+++ b/addons/event_project/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 14:20+0000\n"
+"PO-Revision-Date: 2010-12-28 13:45+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
@@ -64,7 +64,7 @@ msgstr "Projekt Retro Planung"
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Fehler ! Ende der Veranstaltung kann nicht vor Beginn sein."
 
 #. module: event_project
 #: field:event.event,project_id:0
@@ -80,7 +80,7 @@ msgstr "Aufgaben"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "Alle Aufgaben"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
@@ -97,7 +97,7 @@ msgstr "Projektvorlage"
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Veranstaltungen definieren."
 
 #. module: event_project
 #: field:event.event,task_ids:0
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 772771db915..a1209492490 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -84,9 +84,11 @@ class email_server(osv.osv):
     def check_model(self, cr, uid, ids, context = None):
         if context is None:
             context = {}
-        current_rec = self.read(cr, uid, ids, context)[0]
+        current_rec = self.read(cr, uid, ids, context)
         if current_rec:
-            model = self.pool.get(current_rec.get('object_id')[1])
+            current_rec = current_rec[0]
+            model_name = self.pool.get('ir.model').browse(cr, uid, current_rec.get('object_id')[0]).model
+            model = self.pool.get(model_name)
             if hasattr(model, 'message_new'):
                 return True
         return False
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index 28aaf84053d..b671dad3b0b 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 15:28+0000\n"
+"PO-Revision-Date: 2010-12-28 13:52+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -23,6 +23,8 @@ msgid ""
 "Warning! Record for selected Model can not be created\n"
 "Please choose valid Model"
 msgstr ""
+"Warnung ! Datensatz für das ausgewählte Modul kann nicht erstellt werden\n"
+"Bitte wählen Sie ein gültiges Modul aus"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -87,6 +89,8 @@ msgid ""
 "OpenObject Model. Generates a record of this model.\n"
 "Select Object with message_new attrbutes."
 msgstr ""
+"OpenObject Modul. Erzeugt einen Datensatz aus diesem Modul.\n"
+"Wähle Objekt mit message_new Attribut."
 
 #. module: fetchmail
 #: field:email.server,attach:0
@@ -96,7 +100,7 @@ msgstr "Hinzufügen Anhang ?"
 #. module: fetchmail
 #: view:email.server:0
 msgid "# of emails"
-msgstr ""
+msgstr "# EMails"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
@@ -219,7 +223,7 @@ msgstr "POP/IMAP Server"
 #. module: fetchmail
 #: constraint:email.server:0
 msgid "Warning! Can't have duplicate server configuration!"
-msgstr ""
+msgstr "Warnung ! Doppelte Server Konfiguration ist nicht möglich !"
 
 #. module: fetchmail
 #: field:email.server,type:0
@@ -294,7 +298,7 @@ msgstr "Priorität 0 bis 10, wähle entsprechende Reihenfolge"
 #. module: fetchmail
 #: field:email.server,action_id:0
 msgid "Email Server Action"
-msgstr ""
+msgstr "EMail Serveraktion"
 
 #. module: fetchmail
 #: field:email.server,priority:0
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index adcd4fab2dd..5342190b1f9 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-19 22:23+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-28 15:55+0000\n"
+"Last-Translator: Aline (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-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -101,7 +100,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Email History"
-msgstr ""
+msgstr "Historique des courriels"
 
 #. module: fetchmail
 #: field:email.server,user_id:0
@@ -156,7 +155,7 @@ msgstr "Message pour la passerelle de courriel"
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 msgid "POP Servers"
-msgstr ""
+msgstr "Serveurs POP"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -172,7 +171,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
 msgid "Fetchmail Services"
-msgstr ""
+msgstr "Services Fetchmail"
 
 #. module: fetchmail
 #: field:email.server,server:0
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 0aa26987aa5..0aa26987aa5 100755..100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 7c400ecf40e..103b0534349 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -221,7 +221,7 @@ class hr_department(osv.osv):
     _inherit = 'hr.department'
     _columns = {
         'manager_id': fields.many2one('hr.employee', 'Manager'),
-        'member_ids': fields.one2many('hr.employee', 'department_id', 'Members'),
+        'member_ids': fields.one2many('hr.employee', 'department_id', 'Members', readonly=True),
     }
 
 hr_department()
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 076c207f850..5c257e9e6c9 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -3,13 +3,12 @@
     <data>
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"
-            groups="base.group_hr_manager,base.group_hr_user"
             web_icon="images/hr.png"
             web_icon_hover="images/hr-hover.png"/>
-        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager"/>
+        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
 
         <!--
         ==========
@@ -155,7 +154,7 @@
             <field name="help">Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.</field>
         </record>
 
-        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
         <!--
         =======================
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index df230d9ed68..590c5cb846b 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 14:03+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -159,7 +160,7 @@ msgstr "Meine Abteilungen"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "Verheiratet"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -330,6 +331,8 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"Sie können die Anwendungen für das Personalwesen durch weitere \"HR\" "
+"Funktionen erweitern."
 
 #. module: hr
 #: view:hr.employee:0
@@ -520,7 +523,7 @@ msgstr ""
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -570,6 +573,14 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"    Anwendung für die Personalverwaltung. Folgende Ressourcen können durch "
+"die Anwendung verwaltet werden:\n"
+"    * Mitarbeiter und Personalhierachie: Sie können Mitarbeiter und deren "
+"Vorgesetzte definieren.\n"
+"    * Abteilungen\n"
+"    * Arbeitsstellen\n"
+"    "
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -648,7 +659,7 @@ msgstr "Persönliche Info"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Ausweis Nr."
 
 #. module: hr
 #: view:res.users:0
@@ -709,7 +720,7 @@ msgstr "Mitarbeitervergütung"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Alleinstehend"
 
 #. module: hr
 #: field:hr.job,name:0
@@ -816,7 +827,7 @@ msgstr "Mentor"
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "Konfigurieren Sie Ihre Personalanwendungen"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
@@ -834,7 +845,7 @@ msgstr "Manager"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Verwitwet"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index d0d08d8ec04..c63d0eb4755 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:17+0000\n"
+"PO-Revision-Date: 2010-12-27 09:11+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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 e2034d645b0..5c6a2167612 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-10-30 09:35+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-12-28 21:59+0000\n"
+"Last-Translator: Dejan Radočaj <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-12-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -26,17 +26,17 @@ msgstr "OpenERP korisnik"
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Preduvjeti"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr "Greška! Ne možete kreirati rekurzivne odjele!"
+msgstr "Pogreška! Ne možete kreirati rekurzivne odjele!"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Poveži djelatnika sa podacima"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -50,19 +50,19 @@ msgstr "SIN No"
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Ljudski Resursi"
+msgstr "Ljudski resursi"
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr ""
+msgstr "Poslovna el. pošta"
 
 #. module: hr
 #: view:hr.employee:0
@@ -76,27 +76,27 @@ msgstr "Odjel"
 #. module: hr
 #: help:hr.installer,hr_attendance:0
 msgid "Simplifies the management of employee's attendances."
-msgstr ""
+msgstr "Pojednostavljuje upravljanje podacima prisustva djelatnika"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Označi kao Staro"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "Poslovi"
 
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr ""
+msgstr "U regrutiranju"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "naslov"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -109,22 +109,22 @@ msgstr "Tvrtka"
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Očekivano u regrutiranju"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "Praznici"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
 msgid "Tracks employee leaves, allocation requests and planning."
-msgstr ""
+msgstr "Prati odsustva djelatnika, zahtjeve raspoređivanja i planiranje"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr ""
+msgstr "Bračni status djelatnika"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -132,52 +132,54 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Partner koji je povezan sa trenutnim djelatnikom. Knjigovodstvena "
+"transakcija koja će biti zapisana na ovom partneru pripada djelatniku."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr ""
+msgstr "Poveži korisnika sa djelatnikom"
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr ""
+msgstr "Ugovori djelatnika"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
 msgid "Generic Payroll system."
-msgstr ""
+msgstr "Opći sustav obračuna plaća"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "Djelatnik mojih odjela"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "U braku"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Pogreška ! Ne možete odabrati odjel u kojemu je djelatnik menadžer."
 
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr ""
+msgstr "Podaci putovnice djelatnika"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Pozicija"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "Hijerarhija Djelatnika"
+msgstr "Hijerarhija djelatnika"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -185,22 +187,24 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"Polje pripadajućeg korisnika na formi djelatnika dozvoljava povezivanje "
+"OpenERP korisnika (i njegovih prava) sa djelatnikom"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "U regrutiranju"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "Identifikacijski broj"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr ""
+msgstr "Broj zaposlenika"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -212,31 +216,32 @@ msgstr "Žensko"
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Prati i pomaže djelatnicima u provjeri i potvrdi rasporeda i prisustva"
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Periodičke provjere"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Raspored"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Struktura Djelatnika"
+msgstr "Struktura djelatnika"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr "Osobni ID brojevi"
+msgstr "JMBG-ovi"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "Broj djelatnika sa tim poslom."
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -253,7 +258,7 @@ msgstr "Slijedne Kategorije"
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Opis posla"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -271,7 +276,7 @@ msgstr "Djelatnik"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Ostali podaci"
 
 #. module: hr
 #: field:hr.department,complete_name:0
@@ -282,7 +287,7 @@ msgstr "Ime"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "Datum rođenja"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -292,19 +297,19 @@ msgstr "Izvještavanje"
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr ""
+msgstr "ir.actions.act_window"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "Nadzorna ploča odjela ljudskih resursa"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "Posao"
 
 #. module: hr
 #: view:hr.department:0
@@ -323,21 +328,23 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"Moguće je povećati mogućnosti aplikacije ljudskih resursa instalacijom "
+"nekoliko funkcionalnosti povezanih sa odjelom ljudskih resursa."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr ""
+msgstr "Očekivano djelatnika"
 
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "JMBG"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
@@ -347,12 +354,12 @@ msgstr "Razveden-a"
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "Ishodna Kategorija"
+msgstr "Nadređena kategorija"
 
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "Pogreška ! Ne možete kreirati rekurzivne kategorije."
 
 #. module: hr
 #: view:hr.department:0
@@ -366,12 +373,12 @@ msgstr "Odjeli"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "Kontakt Djelatnika"
+msgstr "Kontakt djelatnika"
 
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Moja ploča"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -381,7 +388,7 @@ msgstr "Muško"
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Tijek konfiguracije"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
@@ -393,17 +400,17 @@ msgstr "Kategorije djelatnika"
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Kategorija Djelatnika"
+msgstr "Kategorija djelatnika"
 
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "Ugovor djelatnika"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -411,21 +418,23 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
+"Omogućava kreiranje i upravljanje periodičkom procjenom i provjerom "
+"učinkovitosti djelatnika."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "Odjel Ljudskih Resursa"
+msgstr "hr.department"
 
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr ""
+msgstr "Povezano je s upraviteljem odjela"
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Postupak regrutiranja"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
@@ -447,11 +456,21 @@ msgid ""
 "they will be able to enter time through the system. In the note tab, you can "
 "enter text data that should be recorded for a specific employee."
 msgstr ""
+"Ovdje možete upravljati radnom snagom putem kreiranja djelatnika i "
+"pridružujući im posebna svojstva u sustavu. Održavajte ispravnim sve podatke "
+"vezane uz djelatnike i vodite računa o svemu što mora biti snimljeno za "
+"njih. Kartica privatnih informacija će pomoći u održavanju podataka o "
+"njihovom identitetu. Kartica kategorija pruža mogućnost pridruživanja "
+"odgovarajućih kategorija zaposlenika prema poziciji i aktivnostima u tvrtci. "
+"Kategorija može biti duljina radnog staža u odjelu ili tvrtki. Kartica "
+"rasporeda omogućava da se djelatnicima pridruži određeni raspored i "
+"analitički dnevnik gdje će moći unijeti vrijeme putem sustava. U kartici  "
+"bilješki moguće je unijeti tekstualne podatke za pojedinog djelatnika."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "Konto za plaću djelatnika"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -461,7 +480,7 @@ msgstr "Bilješka"
 #. module: hr
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Odabrana tvrtka nije među dozvoljenim tvrtkama za ovog korisnika"
 
 #. module: hr
 #: view:hr.employee:0
@@ -476,7 +495,7 @@ msgstr "Poslovna adresa"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Nadzorna ploča upravitelja HR"
 
 #. module: hr
 #: view:hr.employee:0
@@ -490,32 +509,35 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitements, etc."
 msgstr ""
+"Struktura odjela vaše tvrtke se koristi za upravljanje svim dokumentima "
+"povezanim sa djelatnicima po odjelima: troškovi i provjere rasporeda, "
+"upravljanje odsustvima, regrutacijama, itd."
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Podesi"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories structure"
-msgstr "Struktura Kategorija"
+msgstr "Struktura kategorija"
 
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoznato"
 
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "Upravljanje praznicima / odsustvima"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr "SSN No"
+msgstr "JMBG"
 
 #. module: hr
 #: view:hr.employee:0
@@ -525,7 +547,7 @@ msgstr "Aktivan"
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Greška! Ne možete kreirati rekurzivnu Hijerarhiju Djelatnika"
+msgstr "Pogreška ! Ne možete kreirati rekurzivnu hijerarhiju djelatnika."
 
 #. module: hr
 #: view:hr.department:0
@@ -550,32 +572,34 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
+"Na formi djelatnika postoje različite vrste informacija poput podataka "
+"kontakta."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "Ukupan broj djelatnika potreban za taj posao."
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Staro"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "Opis statusa"
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Ne možete imati dva korisnika sa istim korisničkim imenom !"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -589,27 +613,27 @@ msgstr "Bračni status"
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
 msgid "Helps you manage and streamline your recruitment process."
-msgstr ""
+msgstr "Pomaže u upravljanju i usmjeravanju procesa regrutiranja."
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Forma i struktura djelatnika"
 
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr ""
+msgstr "Slika"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "Knjigovodstvo obračuna plaća"
 
 #. module: hr
 #: view:hr.employee:0
@@ -624,7 +648,7 @@ msgstr ""
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Trenutna aktivnost"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -632,16 +656,18 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Prati i upravlja troškove djelatnika , moguće je automatski ponovno "
+"fakturirati klijente ako su troškovi povezani sa projektom."
 
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr ""
+msgstr "Trenutno"
 
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr "Ishodni Odjel"
+msgstr "Nadređeni odjel"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -662,33 +688,34 @@ msgstr "Nazočnosti"
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
 msgstr ""
+"Proširuje profil djelatnika radi lakšeg upravljanja njihovim ugovorima."
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "Obračun plaće"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Samac"
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "Naziv posla"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "Na poziciji"
 
 #. module: hr
 #: view:hr.department:0
@@ -710,23 +737,23 @@ msgstr "Bilješke"
 #. module: hr
 #: model:ir.model,name:hr.model_hr_installer
 msgid "hr.installer"
-msgstr ""
+msgstr "hr.installer"
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "Ploča upravitelja HR"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Sredstva"
 
 #. module: hr
 #: view:hr.installer:0
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
-msgstr ""
+msgstr "Postavke aplikacije ljudskih resursa"
 
 #. module: hr
 #: field:hr.employee,gender:0
@@ -747,49 +774,49 @@ msgstr "Djelatnici"
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Bankovni konto"
 
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr "Ime Odjela"
+msgstr "Naziv odjela"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "JMBG"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "Kreiranje OpenERP korisnika"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "Slijedni Odjeli"
+msgstr "Podređeni odjeli"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr ""
+msgstr "Poslovne pozicije"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Trener"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "Promjena postavki aplikacije ljudskih resursa"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "Troškovi"
 
 #. module: hr
 #: view:hr.department:0
@@ -802,12 +829,12 @@ msgstr "Voditelj"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Udovac-ica"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr ""
+msgstr "Opći sustav obračuna plaća integriran sa knjigovodstvom"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -816,229 +843,26 @@ msgid ""
 "a survey to a job position. This survey will be used in the recruitment "
 "process to evaluate the applicants for this job position."
 msgstr ""
+"Poslovne pozicije se koriste za definiranje poslova i njihovih zahtjeva. "
+"Moguće je priložiti anketu poslovnoj poziciji. Ova anketa će se koristiti u "
+"procesu regrutacije za procjenu aplikanata za tu poslovnu poziciju."
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr "Podređeni Djelatnici"
-
-#~ msgid "Attendance"
-#~ msgstr "Nazočnost"
+msgstr "Podređeni djelatnici"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
-#~ msgid "Sign in / Sign out"
-#~ msgstr "Prijava / Odjava"
-
-#~ msgid ""
-#~ "(*) A positive delay means that the employee worked less than recorded."
-#~ msgstr ""
-#~ "(*) Pozitivno kašnjenje znači da je Djelatnik radio manje no što je "
-#~ "zabilježeno."
-
-#~ msgid "Employee attendances"
-#~ msgstr "Nazočnost Djelatnika"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
-#~ msgid "You are now ready to sign in or out of the attendance follow up"
-#~ msgstr "Sada se možete prijaviti ili odjaviti iz praćenja Nazočnosti"
-
-#~ msgid "Sign out"
-#~ msgstr "Odjava"
-
-#~ msgid "Delay"
-#~ msgstr "Kašnjenje"
-
-#~ msgid "Employee's name"
-#~ msgstr "Ime Djelatnika"
-
-#~ msgid "Print Timesheet"
-#~ msgstr "Tiskaj Kontrolnu Karticu"
-
-#~ msgid "Print Attendance Error Report"
-#~ msgstr "Tiskaj izvještaj greške Nazočnosti"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nepravilno ime modela u definiciji radnje."
 
-#~ msgid "Print Timesheet by week"
-#~ msgstr "Tiskaj Kontrolnu karticu po tjednu"
-
-#~ msgid "Select a time span"
-#~ msgstr "Odaberi razdoblje"
-
-#~ msgid "Date Recorded"
-#~ msgstr "datum bilježenja"
-
-#~ msgid "Sign In"
-#~ msgstr "Prijava"
-
-#~ msgid "Total period:"
-#~ msgstr "Ukupno vremensko trajanje:"
-
-#~ msgid "Action reason"
-#~ msgstr "Razlog radnje"
-
-#~ msgid "March"
-#~ msgstr "Ožujak"
-
-#~ msgid "August"
-#~ msgstr "Kolovoz"
-
-#~ msgid "May"
-#~ msgstr "Svibanj"
-
-#~ msgid "Your last sign in"
-#~ msgstr "Vaša zadnja prijava"
-
-#~ msgid "June"
-#~ msgstr "Lipanj"
-
-#~ msgid "Print Timesheet by month"
-#~ msgstr "Tiskaj Kontrolnu karticu po mjesecu"
-
-#~ msgid "Sign Out"
-#~ msgstr "Odjava"
-
-#~ msgid "Attendances Of Employees"
-#~ msgstr "Nazočnosti Djelatnika"
-
-#~ msgid "Reason"
-#~ msgstr "Razlog"
-
-#~ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-#~ msgstr "Greška: Prijava (Odn. Odjava) mora slijediti Odjavu (Odn. Prijavu)"
-
-#~ msgid "Date Signed"
-#~ msgstr "Datum zabilježbe"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "July"
-#~ msgstr "Srpanj"
-
-#~ msgid ""
-#~ "You did not signed out the last time. Please enter the date and time you "
-#~ "signed out."
-#~ msgstr ""
-#~ "Zadnji puta se niste odjavili. Molim Vas, unesite datum i vrijeme kad ste se "
-#~ "trebali odjaviti."
-
-#~ msgid "Attendance reasons"
-#~ msgstr "Razlozi nazočnosti"
-
-#~ msgid "Starting Date"
-#~ msgstr "Početni datum"
-
-#~ msgid "Present"
-#~ msgstr "Prisutan"
-
-#~ msgid "Absent"
-#~ msgstr "Odsutan"
-
-#~ msgid "February"
-#~ msgstr "Veljača"
-
-#~ msgid "October"
-#~ msgstr "Listopad"
-
-#~ msgid "Your last sign out"
-#~ msgstr "Vaša zadnja Odjava"
-
-#~ msgid "Min Delay"
-#~ msgstr "Min kašnjenje"
-
-#~ msgid "Action's type"
-#~ msgstr "Tip radnje"
-
-#~ msgid "Define attendance reason"
-#~ msgstr "Definirajte razlog nazočnosti"
-
-#~ msgid "Sign in"
-#~ msgstr "Prijava"
-
-#~ msgid "Analysis Information"
-#~ msgstr "Podaci Analize"
-
-#~ msgid "Current state"
-#~ msgstr "Tekuće stanje"
-
-#~ msgid "January"
-#~ msgstr "Siječanj"
-
-#~ msgid "April"
-#~ msgstr "Travanjž"
-
-#~ msgid "Attendance Errors"
-#~ msgstr "Greške nazočnosti"
-
-#~ msgid "Action"
-#~ msgstr "Radnja"
-
-#~ msgid "Print Attendance Report"
-#~ msgstr "Tiskaj izvještaj Nazočnosti"
-
-#~ msgid "Attendance Reasons"
-#~ msgstr "Razlozi nazočnosti"
-
-#~ msgid "November"
-#~ msgstr "Studeni"
-
-#~ msgid "Bellow this delay, the error is considered to be voluntary"
-#~ msgstr "Ispod tog kašnjenja, greška se smatra proizvoljnom."
-
-#~ msgid "Max. Delay (Min)"
-#~ msgstr "Max. Kašnjenje (min)"
-
-#~ msgid "Select a starting and a end date"
-#~ msgstr "Odaberite datum početka i završetka"
-
-#~ msgid "Ending Date"
-#~ msgstr "Datum završetka"
-
-#~ msgid ""
-#~ "You did not signed in the last time. Please enter the date and time you "
-#~ "signed in."
-#~ msgstr ""
-#~ "Zadnji puta se niste prijavili. Molim Vas, unesite datum i vrijeme kad ste "
-#~ "se trebali prijaviti."
-
-#~ msgid "September"
-#~ msgstr "Rujan"
-
-#~ msgid "December"
-#~ msgstr "Prosinac"
-
-#~ msgid "Employee attendance"
-#~ msgstr "Nazočnost Djelatnika"
-
-#~ msgid "Select a month"
-#~ msgstr "Odaberite mjesec"
-
-#~ msgid "Month"
-#~ msgstr "Mjesec"
-
-#~ msgid "This module aims to manage employee's attendances."
-#~ msgstr "Ovaj modul treba upravljati nazočnostima Djelatnika"
-
-#~ msgid "Attendance Error Report"
-#~ msgstr "Izvještaj greške Nazočnosti"
-
-#~ msgid "Year"
-#~ msgstr "Godina"
-
-#~ msgid "Cancel"
-#~ msgstr "Odustani"
-
-#~ msgid "Operation"
-#~ msgstr "Djelovanje"
-
 #~ msgid "Working Time Categories"
 #~ msgstr "Kategorije radnog vremena"
 
@@ -1149,3 +973,6 @@ msgstr "Podređeni Djelatnici"
 
 #~ msgid "New Employee"
 #~ msgstr "Novi Djelatnik"
+
+#~ msgid "Passport"
+#~ msgstr "Putovnica"
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 0e93689262d..d9ff3bd9f47 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-29 07:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 17:57+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <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-12-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -157,7 +157,7 @@ msgstr "Dipendente dei miei dipartimenti"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "Sposato/a"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -482,6 +482,7 @@ msgstr "Nota"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"L'azienda scelta non è tra le aziende a cui questo utente ha l'accesso"
 
 #. module: hr
 #: view:hr.employee:0
@@ -517,7 +518,7 @@ msgstr ""
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -595,7 +596,7 @@ msgstr "Descrizione Stato"
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Non è possibile avere due utenti con lo stesso login!"
 
 #. module: hr
 #: view:hr.job:0
@@ -645,7 +646,7 @@ msgstr "Informazioni Personali"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Num. passaporto"
 
 #. module: hr
 #: view:res.users:0
@@ -706,7 +707,7 @@ msgstr "Libro paga"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Celibe/nubile"
 
 #. module: hr
 #: field:hr.job,name:0
@@ -831,7 +832,7 @@ msgstr "Responsabile"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Vedovo"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index ab8eb568264..ac06a681d8f 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,1,1,1
+"access_hr_employee_category_emp","hr.employee.category.emp","model_hr_employee_category","base.group_user",1,0,0,0
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_system_user","hr.employee system user","model_hr_employee","base.group_user",1,0,0,0
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index de541fa368b..b5ac89f0f6d 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/i18n/de.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 14:07+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -112,6 +113,8 @@ msgstr "Definiere Begründungen für An-/Abmeldung"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+"die Leitung ausübt."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
@@ -196,6 +199,13 @@ msgid ""
 "    actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"    Diese Anwendung kann die Anwesenheit von Mitarbeitern verwalten und "
+"erfassen.\n"
+"    Ermittelt werden die Arbeitszeiten von Mitarbeitern auf der Basis der "
+"von Ihnen\n"
+"    erfassten Anmeldungen und Abmeldungen.\n"
+"       "
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
@@ -350,6 +360,7 @@ msgstr "November"
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index 166c14c1f83..e2ab58e92b6 100644
--- a/addons/hr_attendance/i18n/es.po
+++ b/addons/hr_attendance/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:12+0000\n"
+"PO-Revision-Date: 2010-12-27 09:11+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 919aea0d57f..51d5e87145c 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,4 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
+"access_hr_action_reason_employee","hr.action.reason.employee","model_hr_action_reason","base.group_user",1,1,1,1
 "access_hr_attendance_user","hr.attendance.user","model_hr_attendance","base.group_hr_user",1,1,1,1
-"access_hr_attendance_system_user","hr.attendance.system.user","model_hr_attendance","base.group_user",1,0,0,0
+"access_hr_attendance_system_user","hr.attendance.system.user","model_hr_attendance","base.group_user",1,1,1,1
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index ed08ee93174..948ac1128fa 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -68,7 +68,7 @@ class hr_sign_in_out(osv.osv_memory):
     _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),
+        'emp_id': fields.char('Employee ID', size=32, required=True, readonly=True),
                 }
 
     def _get_empid(self, cr, uid, context=None):
@@ -176,4 +176,4 @@ class hr_sign_in_out(osv.osv_memory):
 
 hr_sign_in_out()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index aea686e4279..aea686e4279 100755..100644
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 3ad44ef3065..7ed2d16d6b7 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -114,6 +114,18 @@ class hr_contract(osv.osv):
         'date_start': lambda *a: time.strftime("%Y-%m-%d"),
     }
 
+    def _check_dates(self, cr, uid, ids, context=None):
+        for contract in self.read(cr, uid, ids, ['date_start', 'date_end'], context=context):
+             if contract['date_start'] and contract['date_end'] and contract['date_start'] > contract['date_end']:
+                 return False
+        return True
+
+    _constraints = [
+        (_check_dates, 'Error! contract start-date must be lower then contract end-date.', ['date_start', 'date_end'])
+    ]
+
+
+
 hr_contract()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index a67be5d0ad2..35d375fea1d 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -57,7 +57,7 @@
             <field name="search_view_id" ref="hr_contract_wage_type_view_search"/>
         </record>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_hr_manager"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56" sequence="7"/>
 
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
@@ -120,24 +120,10 @@
                         <field name="medic_exam" />
                         </group>
                     </page>
-                    <page string="Contracts">
-                        <field colspan="4" name="contract_ids" nolabel="1"/>
-                    </page>
                 </page>
             </field>
         </record>
 
-        <record id="hr_employee_view_form3" model="ir.ui.view">
-            <field name="name">hr.employee.view.form3</field>
-            <field name="model">hr.employee</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-                <field name="parent_id" position="after">
-                    <field name="contract_id"/>
-                </field>
-            </field>
-        </record>
 
         <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
@@ -281,7 +267,7 @@
         </record>
 
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6"/>
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/>
 
         <!-- Contracts Button on Employee Form -->
         <act_window 
@@ -289,7 +275,8 @@
         id="act_hr_employee_2_hr_contract" 
         name="Contracts" 
         res_model="hr.contract" 
-        src_model="hr.employee"/>
+        src_model="hr.employee"
+        groups="base.group_hr_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index fe4dfdef57d..0bb9eec78eb 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 17:30+0000\n"
+"PO-Revision-Date: 2010-12-28 14:09+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -193,6 +193,14 @@ msgid ""
 "    You can assign several contracts per employee.\n"
 "    "
 msgstr ""
+"\n"
+"    Sie können alle vertragsrelevanten Informationen für den Mitarbeiter "
+"erfassen:\n"
+"    * Familienstand,\n"
+"    * Sozialversicherungsnummer,\n"
+"    * Geburtsort und -datum, ...\n"
+"    Sie können durchaus mehrere Verträge für einen Mitarbeiter hinterlegen.\n"
+"    "
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -233,6 +241,7 @@ msgstr "Suche Vergütungsarten"
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -266,6 +275,8 @@ msgstr "Bemerkungen"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+"die Leitung ausübt."
 
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
index e976edae71c..b6ef3a0a7b0 100644
--- a/addons/hr_contract/i18n/es.po
+++ b/addons/hr_contract/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:14+0000\n"
+"PO-Revision-Date: 2010-12-27 09:13+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 36456284856..202fcb3bdb4 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,7 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_contract_wage_type_period_user","hr.contract.wage.type.period.user","model_hr_contract_wage_type_period","base.group_hr_user",1,1,1,1
 "access_hr_contract_wage_type_user","hr.contract.wage.type.user","model_hr_contract_wage_type","base.group_hr_user",1,1,1,1
-"access_hr_contract_user","hr.contract.user","model_hr_contract","base.group_hr_user",1,1,1,1
 "access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
 "access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
 "access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index d00f69bc0de..160105a69ad 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -199,15 +199,15 @@ class hr_evaluation(osv.osv):
         for evaluation in self.browse(cr, uid, ids, context=context):
             wait = False
             for phase in evaluation.plan_id.phase_ids:
-                childs = []
+                children = []
                 if phase.action == "bottom-up":
-                    childs = evaluation.employee_id.child_ids
+                    children = evaluation.employee_id.child_ids
                 elif phase.action in ("top-down", "final"):
                     if evaluation.employee_id.parent_id:
-                        childs = [evaluation.employee_id.parent_id]
+                        children = [evaluation.employee_id.parent_id]
                 elif phase.action == "self":
-                    childs = [evaluation.employee_id]
-                for child in childs:
+                    children = [evaluation.employee_id]
+                for child in children:
 #                    if not child.user_id:
 #                        continue
 
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 83b25c177ff..d8d69610d25 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -64,7 +64,7 @@
         </record>
 
         <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
-        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_hr_manager"/>
+        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
         <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
 
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 19e9bcaa7ab..a7a6370496d 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:20+0000\n"
+"PO-Revision-Date: 2010-12-28 14:28+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
@@ -122,6 +122,8 @@ msgid ""
 "This number of months will be used to schedule the first evaluation date of "
 "the employee when selecting an evaluation plan. "
 msgstr ""
+"Die Anzahl in Monaten, nach der die erste Beurteilung des Mitarbeiters nach "
+"der Zuweisung eines Beurteilungsverfahrens erfolgen soll. "
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -138,6 +140,8 @@ msgstr "Beurteilungsanfrage"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+"die Leitung ausübt."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -181,7 +185,7 @@ msgstr "Juli"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Evaluations (months)"
-msgstr ""
+msgstr "Beurteilungsfrequenz (in Monaten)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:0
@@ -199,7 +203,7 @@ msgstr "Enddatum"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Evaluation in (months)"
-msgstr ""
+msgstr "Erste Beurteilung nach (Monaten)"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
@@ -276,7 +280,7 @@ msgstr " Monat "
 msgid ""
 "The number of month that depicts the delay between each evaluation of this "
 "plan (after the first one)."
-msgstr ""
+msgstr "Anzahl Monate zwischen den regelmäßigen Beurteilungen"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
@@ -305,6 +309,19 @@ msgid ""
 "          in the form of.Implements a dashboard for My Current Evaluations\n"
 "         "
 msgstr ""
+"\n"
+"          Anwendung für die Mitarbeiterbeurteilung.\n"
+"           Eine Mitarbeiterbeurteilung kann dabei sowohl für Vorgsetzte "
+"durch die Mitarbeiter,\n"
+"           als auch für Mitarbeiter durch deren Abteilungs- oder "
+"Gruppenleiter erfolgen. Das Vorgehen\n"
+"           einer Beurteilung erfolgt dabei planmäßig durch eine bestimmte "
+"Abfolge verschiedener\n"
+"           Befragungen von Mitarbeitern und Vorgesetzten bis zu einer "
+"abschliessenden Beurteilung.\n"
+"           Alle anstehenden Beurteilungsverfahren sind über die Personal "
+"Pinnwand ersichtlich.\n"
+"         "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -627,6 +644,7 @@ msgstr "Erweiterter Filter..."
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -741,7 +759,7 @@ msgstr "Sende alle Antworten an Mitarbeiter"
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Evaluation Date"
-msgstr ""
+msgstr "Nächste Beurteilung"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -927,6 +945,8 @@ msgid ""
 "The date of the next evaluation is computed by the evaluation plan's dates "
 "(first evaluation + periodicity)."
 msgstr ""
+"Das Datum für die nächste Beurteilung wird automatisch auf Basis des "
+"zugeordneten Beurteilungsverfahrens errechnet (Erste Bewertung + Frequenz)"
 
 #~ msgid "Information"
 #~ msgstr "Information"
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 49b0e19177b..1520b61b55a 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -19,8 +19,5 @@
     <record id="survey.menu_answer_surveys" model="ir.ui.menu">
         <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
     </record>
-    <record id="survey.menu_run_survey_form" model="ir.ui.menu">
-        <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
-    </record>
     </data>
-</openerp>
-\ No newline at end of file
+</openerp>
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index 4b64a1bdf19..0493f628ebd 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
         <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 1fc39982da4..17e0dd09bf9 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -28,11 +28,11 @@
             <field name="arch" type="xml">
                 <tree string="Expenses" colors="blue:state=='draft'">
                     <field name="employee_id"/>
+                    <field name="date"/>
                     <field name="user_id" invisible="1"/>
                     <field name="department_id" groups="base.group_extended"/>
-                    <field name="name"/>
-                    <field name="date"/>
                     <field name="ref"/>
+                    <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
                     <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
@@ -175,7 +175,8 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
-            <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, employees record their expenses. At the end of the month, the manager concerned validates the Expense Sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
+            <field name="view_id" ref="view_expenses_tree"/>
+            <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
 
         <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/>
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index 69ede4821f4..fd44a293e9b 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:24+0000\n"
+"PO-Revision-Date: 2010-12-28 14:36+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -139,6 +139,24 @@ msgid ""
 "    re-invoice your customer's expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"    Diese Anwendung verwaltet die Spesenabrechnungen von Mitarbeitern.\n"
+"\n"
+"     Der gesamte Vorgang wird über folgenden Workflow umgesetzt:\n"
+"     * Erstellung einer Spesenabrechnung im Entwurf\n"
+"     * Bestätigung der Spesenabrechnung durch den Mitarbeiter\n"
+"     * Prüfung und Freigabe durch den Vorgesetzten\n"
+"     * Prüfung und Buchung durch einen Mitarbeiter der Buchhaltung\n"
+"     * Auszahlung der Spesenerstattung an den Mitarbeiter\n"
+"\n"
+"     Diese Anwendung ist kompatibel mit der Funktionalität zur  "
+"Mitarbeiterzeitabrechnung\n"
+"     und nutzt somit ebenfalls die Möglichkeit analytischer Konten für eine "
+"Weiterberechnung\n"
+"     an Kunden, z.B. bei projektbezogener Abrechnung von Zeiten und "
+"Aufwendungen.\n"
+"     eine automatische Weiterberechnung an Kunden\n"
+"    "
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -351,7 +369,7 @@ msgstr "Erstattung"
 #: code:addons/hr_expense/hr_expense.py:0
 #, python-format
 msgid "The employee must have a Home address"
-msgstr ""
+msgstr "Der Mitarbeiter muss eine private Anschrift haben."
 
 #. module: hr_expense
 #: view:hr.expense.report:0
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index 55d7ebacdde..f14710274c5 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:30+0000\n"
+"PO-Revision-Date: 2010-12-28 07:22+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -318,12 +318,12 @@ msgstr "Mis gastos"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Creation Date"
-msgstr "Fecha de creación"
+msgstr "Fecha creación"
 
 #. module: hr_expense
 #: model:ir.actions.report.xml,name:hr_expense.hr_expenses
 msgid "HR expenses"
-msgstr "Gastos RH"
+msgstr "Gastos RRHH"
 
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 2b5b9ffb28c..47b7e32e8dd 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -17,3 +17,5 @@
 "access_account_move_line_user","account.move.line.user","account.model_account_move_line","base.group_hr_user",1,1,1,1
 "access_account_analytic_line_user","account.ianalytic.line.user","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
 "access_account_journal_period_manager","account.journal.period.manager","account.model_account_journal_period","base.group_hr_manager",1,1,1,1
+"hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
+"hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index f90607f3cc7..5d3223545b5 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_user"/>
+        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
         <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 398a614d951..0fddec73ee0 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -422,7 +422,8 @@
             <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays" groups="base.group_hr_manager"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays"/>
+        
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 0057f5a3f9b..01aff603626 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -11,7 +11,6 @@
             id="menu_hr_reporting_holidays"
             name="Holidays"
             parent="hr.menu_hr_reporting"
-            sequence="6"
-            groups="base.group_hr_manager" />
+            sequence="6"/>
  	</data>
 </openerp>
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index 1585f4c044f..2ad999e03af 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:05+0000\n"
+"PO-Revision-Date: 2010-12-28 14:40+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -214,6 +214,9 @@ msgid ""
 "You cannot validate leaves for category %s while there are too few remaining "
 "leave days."
 msgstr ""
+"Sie können die Abwesenheitstage für die Kategorie %s nicht prüfen und "
+"freigeben, wenn nicht ausreichend verfügbare Abwesenheitstage hinterlegt "
+"wurden."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -448,6 +451,7 @@ msgstr "Weiss"
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"Fehler ! Das Start Datum für die Abwesenheit muss vor dem Ende Datum liegen !"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -489,7 +493,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Monat -1    "
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -518,6 +522,8 @@ msgid ""
 "You cannot validate leaves for employee %s while there are too few remaining "
 "leave days."
 msgstr ""
+"Sie können die Abwesenheitstage für den Mitarbeiter %s nicht freigeben, da "
+"seine verfügbaren Tage nicht ausreichen."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 657cfd6d748..40a23a0de10 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:18+0000\n"
+"PO-Revision-Date: 2010-12-27 09:09+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index f350b73ed64..6515f0f9730 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,6 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,1,1,1
 "access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,1
+"access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,1,1,1
+"access_hr_holydays_status_employee","hr.holidays.status employee","model_hr_holidays_status","base.group_user",1,0,0,0
 "access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,1,1,1
 "access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1
 "access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 0725e34f0f9..b305e6bf92b 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -55,9 +55,9 @@
         'wizard/hr_payroll_year_salary.xml',
     ],
     'test': [
-#         'test/payslip.yml',
-#         'test/payment_advice.yml',
-#         'test/payroll_register.yml',
+         'test/payslip.yml',
+         'test/payment_advice.yml',
+         'test/payroll_register.yml',
 #         'test/hr_payroll_report.yml',
     ],
     'demo_xml': [
diff --git a/addons/hr_payroll/hr_paroll_report.xml b/addons/hr_payroll/hr_paroll_report.xml
index 732b72f6a1d..732b72f6a1d 100755..100644
--- a/addons/hr_payroll/hr_paroll_report.xml
+++ b/addons/hr_payroll/hr_paroll_report.xml
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index bd3ffad3065..f8571c9dc46 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -27,6 +27,7 @@ from datetime import timedelta
 
 import netsvc
 from osv import fields, osv
+import tools
 from tools.translate import _
 import decimal_precision as dp
 
@@ -1058,7 +1059,7 @@ class hr_payslip(osv.osv):
                 update.update({
                     'basic': round(0.0),
                     'basic_before_leaves': round(0.0),
-                    'name':'Salary Slip of %s for %s' % (slip.employee_id.name, ttyme.strftime('%B-%Y')),
+                    'name':'Salary Slip of %s for %s' % (slip.employee_id.name, tools.ustr(ttyme.strftime('%B-%Y'))),
                     'state':'draft',
                     'contract_id':False,
                     'company_id':slip.employee_id.company_id.id
@@ -1181,7 +1182,7 @@ class hr_payslip(osv.osv):
                 'number':number,
                 'basic': round(basic),
                 'basic_before_leaves': round(basic),
-                'name':'Salary Slip of %s for %s' % (slip.employee_id.name, ttyme.strftime('%B-%Y')),
+                'name':'Salary Slip of %s for %s' % (slip.employee_id.name, tools.ustr(ttyme.strftime('%B-%Y'))),
                 'state':'draft',
                 'contract_id':contract.id,
                 'company_id':slip.employee_id.company_id.id
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8ecd991ce8d..5e1cba9948b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- Root Menus -->
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="9"/>
-        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_hr_manager"/>
+        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
         <!-- Passport Views    -->
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 1110dc45b12..9f6c3f28205 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:17+0000\n"
+"PO-Revision-Date: 2010-12-28 14:41+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -1403,7 +1403,7 @@ msgstr "Netto Lohn"
 #. module: hr_payroll
 #: sql_constraint:hr.passport:0
 msgid "The Passport No must be unique !"
-msgstr ""
+msgstr "Die Nummer des Ausweis sollte eindeutig sein !"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
diff --git a/addons/hr_payroll/i18n/es.po b/addons/hr_payroll/i18n/es.po
index 17bccc3e742..01a55169588 100644
--- a/addons/hr_payroll/i18n/es.po
+++ b/addons/hr_payroll/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 07:59+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 12:45+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -26,7 +25,7 @@ msgstr "Dirección de correo electrónico"
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Based"
-msgstr ""
+msgstr "Basado"
 
 #. module: hr_payroll
 #: field:hr.contract,net:0
@@ -544,18 +543,18 @@ msgstr "Tipo"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡ Error !"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -610,7 +609,7 @@ msgstr "Otros pagos"
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Deductions"
-msgstr ""
+msgstr "Deducciones"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -644,7 +643,7 @@ msgstr "Total por empleado"
 #: selection:hr.payslip.line,amount_type:0
 #: selection:hr.payslip.line.line,amount_type:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Importe fijo"
 
 #. module: hr_payroll
 #: field:company.contribution.line,to_val:0
@@ -652,7 +651,7 @@ msgstr ""
 #: field:hr.payslip.line.line,to_val:0
 #: report:year.salary:0
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
@@ -694,7 +693,7 @@ msgstr "Para el mes de"
 #: field:hr.payslip,deduction:0
 #: selection:hr.payslip.line,type:0
 msgid "Deduction"
-msgstr ""
+msgstr "Deducción"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice
@@ -765,7 +764,7 @@ msgstr "Hoja de confirmación"
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Others:"
-msgstr ""
+msgstr "Otros:"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -817,7 +816,7 @@ msgstr "Tipo de importe"
 #: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -830,7 +829,7 @@ msgstr "Contribución compañía"
 #. module: hr_payroll
 #: field:company.contribution,category_id:0
 msgid "Heads"
-msgstr ""
+msgstr "Cabeceras"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
@@ -840,7 +839,7 @@ msgstr "Imprimir declaración"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -851,7 +850,7 @@ msgstr "Ingresos"
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Basic"
-msgstr ""
+msgstr "Básico"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
@@ -868,7 +867,7 @@ msgstr "Registro salarial"
 #: report:employees.salary:0
 #: report:hr.payroll.register.sheet:0
 msgid "Employee Name"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_passport
@@ -893,13 +892,13 @@ msgstr "Registro de nóminas"
 #: report:hr.payroll.register.sheet:0
 #: report:payroll.advice:0
 msgid "For"
-msgstr ""
+msgstr "Para"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 #: field:hr.passport,contracts_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contratos"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -909,7 +908,7 @@ msgstr "Función del empleado"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Paid"
-msgstr ""
+msgstr "Pagado"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -924,12 +923,12 @@ msgstr "¿Pagado? "
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Validación"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -939,12 +938,12 @@ msgstr "Buscar contribución de la compañía"
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Líneas de pago"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -955,7 +954,7 @@ msgstr "Calcular hoja"
 #: field:company.contribution,active:0
 #: field:hr.payroll.register,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
@@ -970,12 +969,12 @@ msgstr "Detalles del salario anual"
 #. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Condición"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
@@ -991,7 +990,7 @@ msgstr "Aviso de pago:"
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Compute"
-msgstr ""
+msgstr "Calcular"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -999,7 +998,7 @@ msgstr ""
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Designation"
-msgstr ""
+msgstr "Designación"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -1032,7 +1031,7 @@ msgstr "Categoría prima/deducción"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1061,7 +1060,7 @@ msgstr "Fecha próximo mes"
 #: field:hr.payroll.register,date:0
 #: field:hr.payslip,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: hr_payroll
 #: field:hr.contract,visa_expire:0
@@ -1077,7 +1076,7 @@ msgstr "Buscar pasaporte"
 #: report:employees.salary:0
 #: report:salary.structure:0
 msgid "Phone No."
-msgstr ""
+msgstr "Nº Teléfono"
 
 #. module: hr_payroll
 #: field:company.contribution,contribute_per:0
@@ -1086,25 +1085,25 @@ msgstr ""
 #: view:hr.contibution.register:0
 #: view:hr.contibution.register.line:0
 msgid "Contribution"
-msgstr ""
+msgstr "Contribución"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,state:0
 msgid "Label"
-msgstr ""
+msgstr "Etiqueta"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Company contribution"
-msgstr ""
+msgstr "Contribución compañía"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
 msgid "Other No."
-msgstr ""
+msgstr "Otro Nº"
 
 #. module: hr_payroll
 #: field:company.contribution,code:0
@@ -1115,7 +1114,7 @@ msgstr ""
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
@@ -1139,7 +1138,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Computation Overview"
-msgstr ""
+msgstr "Resumen del cálculo"
 
 #. module: hr_payroll
 #: field:hr.payroll.year.salary,salary_on:0
@@ -1151,7 +1150,7 @@ msgstr "Salario sobre"
 #: field:hr.payroll.register,number:0
 #: field:hr.payslip,number:0
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
@@ -1165,7 +1164,7 @@ msgstr ""
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
-msgstr ""
+msgstr "Estructura salarial"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,register_line_ids:0
@@ -1176,13 +1175,13 @@ msgstr ""
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
@@ -1204,7 +1203,7 @@ msgstr "Fecha mes actual"
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Salary"
-msgstr ""
+msgstr "Salario"
 
 #. module: hr_payroll
 #: field:hr.contract,passport_id:0
@@ -1241,7 +1240,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "E-mail"
-msgstr ""
+msgstr "Correo electrónico"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -1254,7 +1253,7 @@ msgstr ""
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Print Report"
-msgstr ""
+msgstr "Imprimir informe"
 
 #. module: hr_payroll
 #: field:company.contribution,line_ids:0
@@ -1263,7 +1262,7 @@ msgstr ""
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
-msgstr ""
+msgstr "Cálculos"
 
 #. module: hr_payroll
 #: help:company.contribution,contribute_per:0
@@ -1281,12 +1280,12 @@ msgstr "Otra información"
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Issue"
-msgstr ""
+msgstr "Incidencia"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -1306,7 +1305,7 @@ msgstr "Salario base sin ausencias:"
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,function_id:0
 msgid "Function"
-msgstr ""
+msgstr "Función"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1316,7 +1315,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Dear Sir/Madam,"
-msgstr ""
+msgstr "Apreciado Sr./Sra.,"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
@@ -1326,7 +1325,7 @@ msgstr "Cabeceras prima/deducción"
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Gross Sal."
-msgstr ""
+msgstr "Sal. bruto"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -1346,24 +1345,24 @@ msgstr ""
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: hr_payroll
 #: field:hr.payroll.employees.detail,date_from:0
 #: field:hr.payroll.year.salary,date_from:0
 #: report:salary.structure:0
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha inicio"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Deduction -"
-msgstr ""
+msgstr "Deducción -"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
@@ -1375,17 +1374,17 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
 #: model:ir.ui.menu,name:hr_payroll.payroll_configure
 msgid "Payroll"
-msgstr ""
+msgstr "Nómina"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
 msgid "Wage Type"
-msgstr ""
+msgstr "Tipo de salario"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
-msgstr ""
+msgstr "Sal. neto"
 
 #. module: hr_payroll
 #: sql_constraint:hr.passport:0
@@ -1408,7 +1407,7 @@ msgstr "hr.nómina.año.salario"
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Address"
-msgstr ""
+msgstr "Dirección"
 
 #. module: hr_payroll
 #: field:hr.payslip.line.line,slipline_id:0
@@ -1426,7 +1425,7 @@ msgstr ""
 #: field:hr.payroll.register,bank_id:0
 #: report:salary.structure:0
 msgid "Bank"
-msgstr ""
+msgstr "Banco"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -1437,7 +1436,7 @@ msgstr ""
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Advance"
-msgstr ""
+msgstr "Adelanto"
 
 #. module: hr_payroll
 #: report:salary.structure:0
@@ -1459,7 +1458,7 @@ msgstr "Primas y deducciones especiales por empleado:"
 #: report:salary.structure:0
 #: report:year.salary:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1469,7 +1468,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -1479,12 +1478,12 @@ msgstr ""
 #: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
 msgid "Employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Cuenta bancaria"
 
 #. module: hr_payroll
 #: help:company.contribution,register_id:0
@@ -1499,7 +1498,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip,total_pay:0
 msgid "Total Payment"
-msgstr ""
+msgstr "Pago total"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1510,23 +1509,23 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for Account Verification"
-msgstr ""
+msgstr "Esperando por verificación de la cuenta"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,comp_deduction:0
 msgid "Company Deduction"
-msgstr ""
+msgstr "Deducción de la Compañía"
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Payroll Configurtion"
-msgstr ""
+msgstr "Configuración nómina"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
 msgid "Please define bank account for the %s employee"
-msgstr ""
+msgstr "Por favor, defina la cuenta bancaria para el empleado %s"
 
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
@@ -1555,7 +1554,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Bank Details"
-msgstr ""
+msgstr "Detalles bancarios"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1568,7 +1567,7 @@ msgstr ""
 #: field:hr.payslip.line,sequence:0
 #: field:hr.payslip.line.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
diff --git a/addons/hr_payroll/report/__init__.py b/addons/hr_payroll/report/__init__.py
index 3113f281326..3113f281326 100755..100644
--- a/addons/hr_payroll/report/__init__.py
+++ b/addons/hr_payroll/report/__init__.py
diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
index 1e4e13e3026..1e4e13e3026 100755..100644
--- a/addons/hr_payroll/report/payslip.rml
+++ b/addons/hr_payroll/report/payslip.rml
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index d5cd6532251..d5cd6532251 100755..100644
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 4314b91a552..4314b91a552 100755..100644
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index bc7ac8fc93a..bc7ac8fc93a 100755..100644
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml
index 2d9fb8465c5..c10ada27c56 100644
--- a/addons/hr_payroll/test/payment_advice.yml
+++ b/addons/hr_payroll/test/payment_advice.yml
@@ -19,19 +19,14 @@
         type_id: hr_contract.hr_contract_type_emp
     country_id: base.in
     department_id: hr.dep_it
-    employee_account: account.a_recv
     gender: male
     marital: hr.hr_employee_marital_status_single
     name: Richie
-    pg_joining: '2009-12-01'
-    property_bank_account: account.cash
-    salary_account: account.a_recv
     vehicle_distance: 0.0
 -
   I create a new payment advice record
 -
   !record {model: hr.payroll.advice, id: hr_payroll_advice_advice0}:
-    account_id: account.cash
     line_ids:
       - amount: 5500.0
         bysal: 5000.0
@@ -56,7 +51,7 @@
 
 -
   Print Payroll Advice
-- 
+-
   !python {model: hr.payroll.advice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('hr_payroll_advice_advice0')], {}, {})
diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml
index 7327688d22a..8bc346a34e1 100644
--- a/addons/hr_payroll/test/payroll_register.yml
+++ b/addons/hr_payroll/test/payroll_register.yml
@@ -18,25 +18,17 @@
         type_id: hr_contract.hr_contract_type_emp
     country_id: base.in
     department_id: hr.dep_it
-    employee_account: account.a_recv
     gender: male
     marital: hr.hr_employee_marital_status_single
     name: Keith
-    pg_joining: '2009-12-01'
-    property_bank_account: account.cash
-    salary_account: account.a_recv
     vehicle_distance: 0.0
 -
   I create a payroll register record.
 -
   !record {model: hr.payroll.register, id: hr_payroll_register_payroll0}:
-    bank_journal_id: account.bank_journal
     date: '2010-07-02'
-    journal_id: account.expenses_journal
     line_ids:
       - employee_id: hr_payroll.hr_employee_keith0
-        bank_journal_id: account.bank_journal
-        journal_id: account.expenses_journal
     name: payroll1
 -
   I click on Compute button.
diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index ca204a62241..aa739d2c9a1 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -29,14 +29,10 @@
         type_id: hr_contract.hr_contract_type_emp
     country_id: base.in
     department_id: hr.dep_it
-    employee_account: account.a_recv
     gender: male
     marital: hr.hr_employee_marital_status_single
     name: Richard
-    pg_joining: '2009-12-01'
-    property_bank_account: account.cash
     bank_account_id: res_partner_bank_0
-    salary_account: account.a_recv
     vehicle_distance: 0.0
 -
   I create a new payroll structure for software developer
@@ -44,8 +40,7 @@
   !record {model: hr.payroll.structure, id: hr_payroll_structure_softwaredeveloper0}:
     code: SD
     line_ids:
-      - account_id: account.a_expense
-        amount: 0.40000000000000002
+      - amount: 0.40000000000000002
         amount_type: per
         category_id: hr_payroll.HRA
         code: HRA
@@ -54,8 +49,7 @@
         sequence: 5
         total: 0.0
         type: allowance
-      - account_id: account.a_expense
-        amount: 10000.0
+      - amount: 10000.0
         amount_type: fix
         category_id: hr_payroll.CA
         code: CA
@@ -64,8 +58,7 @@
         sequence: 10
         total: 0.0
         type: allowance
-      - account_id: account.a_pay
-        amount: 10000.0
+      - amount: 10000.0
         amount_type: fix
         category_id: hr_payroll.PT
         code: PT
@@ -74,8 +67,7 @@
         sequence: 15
         total: 0.0
         type: deduction
-      - account_id: account.a_pay
-        amount: 0.125
+      - amount: 0.125
         amount_type: per
         category_id: hr_payroll.PF
         code: PF
@@ -89,9 +81,8 @@
   I create a employee payslip record
 -
   !record {model: hr.payslip, id: hr_payslip_0}:
-    bank_journal_id: account.bank_journal
     employee_id: hr_payroll.hr_employee_richard0
-    journal_id: account.expenses_journal
+
 -
   I click on 'Compute Sheet' button
 -
diff --git a/addons/hr_payroll/wizard/__init__.py b/addons/hr_payroll/wizard/__init__.py
index 2cf78e17b1c..2cf78e17b1c 100755..100644
--- a/addons/hr_payroll/wizard/__init__.py
+++ b/addons/hr_payroll/wizard/__init__.py
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
index 2bb36b6f282..2bb36b6f282 100755..100644
--- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
index 41caf5f4109..41caf5f4109 100755..100644
--- a/addons/hr_payroll/wizard/hr_payroll_year_salary.py
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index adf1fada169..35f638a3326 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -256,6 +256,10 @@ class hr_payslip(osv.osv):
         period_pool = self.pool.get('account.period')
 
         for slip in self.browse(cr, uid, ids, context=context):
+            if not slip.bank_journal_id or not slip.journal_id:
+                # Call super method to process sheet if journal_id or bank_journal_id are not specified.
+                super(hr_payslip, self).process_sheet(cr, uid, [slip.id], context=context)
+                continue
             line_ids = []
             partner = False
             partner_id = False
@@ -411,6 +415,10 @@ class hr_payslip(osv.osv):
         payslip_pool = self.pool.get('hr.payslip.line')
 
         for slip in self.browse(cr, uid, ids, context=context):
+            if not slip.journal_id:
+                # Call super method to verify sheet if journal_id is not specified.
+                super(hr_payslip, self).verify_sheet(cr, uid, [slip.id], context=context)
+                continue
             total_deduct = 0.0
 
             line_ids = []
diff --git a/addons/hr_payroll_account/hr_payroll_demo.xml b/addons/hr_payroll_account/hr_payroll_demo.xml
index c1d31e0664c..2875c2c03c5 100644
--- a/addons/hr_payroll_account/hr_payroll_demo.xml
+++ b/addons/hr_payroll_account/hr_payroll_demo.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
         <record id="hr_payroll.hr_payslip_line_houserantallowance1" model="hr.payslip.line">
             <field name="account_id" ref="account.a_salary_expense"/>
         </record>
-        
+
         <record id="hr_payroll.hr_payslip_line_convanceallowance1" model="hr.payslip.line">
             <field name="account_id" ref="account.a_salary_expense"/>
         </record>
@@ -26,7 +26,7 @@
 
         <!-- Assigned Default Account in Different Demo Employees -->
 
-        <record id="hr.employee" model="hr.employee">
+        <!--record id="hr.employee" model="hr.employee">
             <field name="property_bank_account" ref="account.bnk"/>
             <field name="salary_account" ref="account.a_salary_expense"/>
             <field name="employee_account" ref="account.a_expense"/>
@@ -37,7 +37,7 @@
             <field name="salary_account" ref="account.a_salary_expense"/>
             <field name="employee_account" ref="account.a_expense"/>
         </record>
-        
+
         <record id="hr.employee2" model="hr.employee">
             <field name="property_bank_account" ref="account.bnk"/>
             <field name="salary_account" ref="account.a_salary_expense"/>
@@ -54,6 +54,52 @@
             <field name="property_bank_account" ref="account.bnk"/>
             <field name="salary_account" ref="account.a_salary_expense"/>
             <field name="employee_account" ref="account.a_expense"/>
+        </record-->
+
+        <record id="bnk" model="account.account">
+            <field name="code">X110041</field>
+            <field name="name">Bank Current Account</field>
+            <field ref="account.cas" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.account_type_asset"/>
+        </record>
+
+        <record id="a_salary_expense" model="account.account">
+            <field name="code">X21122</field>
+            <field name="name">Salary Expenses</field>
+            <field ref="account.ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.account_type_expense"/>
+        </record>
+
+        <record id="a_expense" model="account.account">
+            <field name="code">X21102</field>
+            <field name="name">Expenses</field>
+            <field ref="account.ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.account_type_expense"/>
+        </record>
+
+        <!-- Properties -->
+        <record forcecreate="True" id="property_bank_account" model="ir.property">
+            <field name="name">property_bank_account</field>
+            <field name="fields_id" search="[('model','=','hr.employee'),('name','=','property_bank_account')]"/>
+            <field eval="'account.account,'+str(bnk)" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
+        <record forcecreate="True" id="salary_account" model="ir.property">
+            <field name="name">salary_account</field>
+            <field name="fields_id" search="[('model','=','hr.employee'),('name','=','salary_account')]"/>
+            <field eval="'account.account,'+str(a_salary_expense)" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
+        <record forcecreate="True" id="employee_account" model="ir.property">
+            <field name="name">employee_account</field>
+            <field name="fields_id" search="[('model','=','hr.employee'),('name','=','employee_account')]"/>
+            <field eval="'account.account,'+str(a_expense)" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
 
     </data>
diff --git a/addons/hr_payroll_account/i18n/de.po b/addons/hr_payroll_account/i18n/de.po
index 73977a47f4d..e0c4d019459 100644
--- a/addons/hr_payroll_account/i18n/de.po
+++ b/addons/hr_payroll_account/i18n/de.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-09 08:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 14:47+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\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-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll_account
@@ -95,6 +96,7 @@ msgstr "Bestätigen Sie alle Spesenrechnungen zwecks Erstattung"
 #, python-format
 msgid "Please defined partner in bank account for %s !"
 msgstr ""
+"Bitte definieren Sie den Geschäftspartner für die Bankkontodaten von %s !"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
@@ -105,7 +107,7 @@ msgstr "Finanzen Informationen"
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Please defined bank account for %s !"
-msgstr ""
+msgstr "Bitte definieren Sie ein Bankkonto für %s !"
 
 #. module: hr_payroll_account
 #: model:ir.module.module,description:hr_payroll_account.module_meta_information
@@ -116,6 +118,11 @@ msgid ""
 "    * Comany Contribution Managemet\n"
 "    "
 msgstr ""
+"Basis Personalabrechnung mit integrierter Personalbuchhaltung.\n"
+"    * Aufwandserfassung Arbeitszeiten\n"
+"    * Lohn- und Gehaltszahlung an Mitarbeiter\n"
+"    * Verwaltung von Arbeitsgeberanteilen.\n"
+"    "
 
 #. module: hr_payroll_account
 #: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
@@ -148,6 +155,7 @@ msgstr "Aufwandskonto, welches gebucht wird bei Vergütungsabrechnung"
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
@@ -186,6 +194,8 @@ msgstr "Buchungsbelege"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+"die Leitung ausübt."
 
 #. module: hr_payroll_account
 #: help:hr.payroll.register,period_id:0
@@ -256,7 +266,7 @@ msgstr "Abwesenheitstyp"
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
-msgstr ""
+msgstr "Geschäftsjahr wurde für die Abrechnung %s nicht definiert"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register,analytic_account_id:0
@@ -297,7 +307,7 @@ msgstr "Jahr"
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Period is not defined for slip date %s"
-msgstr ""
+msgstr "Die Periode wurde nicht für das Abrechnungsdatum %s definiert."
 
 #. module: hr_payroll_account
 #: view:hr.employee:0
diff --git a/addons/hr_payroll_account/i18n/es.po b/addons/hr_payroll_account/i18n/es.po
index 36d6d7b78f0..3d67ae7c6fb 100644
--- a/addons/hr_payroll_account/i18n/es.po
+++ b/addons/hr_payroll_account/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:24+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 13:11+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll_account
@@ -27,7 +26,7 @@ msgstr "Movimientos contables"
 #: field:hr.payroll.register,bank_journal_id:0
 #: field:hr.payslip,bank_journal_id:0
 msgid "Bank Journal"
-msgstr ""
+msgstr "Diario bancario"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
@@ -47,17 +46,17 @@ msgstr "Cuenta analítica para análisis de nóminas"
 #. module: hr_payroll_account
 #: field:hr.contibution.register.line,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Período"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Empleado"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Other Informations"
-msgstr ""
+msgstr "Otra información"
 
 #. module: hr_payroll_account
 #: field:hr.payroll.register,journal_id:0
@@ -73,7 +72,7 @@ msgstr "Cuenta de nómina"
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
 msgid "Payroll Register"
-msgstr ""
+msgstr "Registro de nóminas"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
@@ -83,7 +82,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
@@ -95,18 +94,18 @@ msgstr ""
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Please defined partner in bank account for %s !"
-msgstr ""
+msgstr "¡ Por favor, defina la empresa de la cuenta bancaria para %s !"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Accounting Informations"
-msgstr ""
+msgstr "Información contable"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Please defined bank account for %s !"
-msgstr ""
+msgstr "¡ Por favor, defina la cuenta bancaria para %s !"
 
 #. module: hr_payroll_account
 #: model:ir.module.module,description:hr_payroll_account.module_meta_information
@@ -127,7 +126,7 @@ msgstr ""
 #: view:hr.payslip:0
 #: field:hr.payslip,move_payment_ids:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Líneas de pago"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
@@ -149,7 +148,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
@@ -161,17 +160,17 @@ msgstr ""
 #: field:hr.holidays.status,account_id:0
 #: field:hr.payroll.advice,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Cuenta"
 
 #. module: hr_payroll_account
 #: field:hr.employee,property_bank_account:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Cuenta bancaria"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
@@ -188,6 +187,8 @@ msgstr "Recibos contables"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"¡Error! No puede seleccionar un departamento para el cual el empleado sea el "
+"director."
 
 #. module: hr_payroll_account
 #: help:hr.payroll.register,period_id:0
@@ -198,7 +199,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
 msgid "Bank Advice Note"
-msgstr ""
+msgstr "Observación aviso bancario"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,move_id:0
@@ -214,27 +215,27 @@ msgstr "Recibos contables"
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: hr_payroll_account
 #: field:hr.employee,employee_account:0
 msgid "Employee Account"
-msgstr ""
+msgstr "Cuenta empleado"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.line,account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Cuenta general"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register,yearly_total_by_emp:0
 msgid "Total By Employee"
-msgstr ""
+msgstr "Total por empleado"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,slip_id:0
@@ -246,12 +247,12 @@ msgstr ""
 #: field:hr.payroll.register,period_id:0
 #: field:hr.payslip,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Forzar período"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
 msgid "Leave Type"
-msgstr ""
+msgstr "Tipo de ausencia"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
@@ -266,22 +267,22 @@ msgstr ""
 #: field:hr.payroll.structure,account_id:0
 #: field:hr.payslip.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Cuenta analítica"
 
 #. module: hr_payroll_account
 #: help:hr.employee,employee_account:0
 msgid "Employee Payable Account"
-msgstr ""
+msgstr "Cuenta a pagar del empleado"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register,yearly_total_by_comp:0
 msgid "Total By Company"
-msgstr ""
+msgstr "Total por compañía"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
 msgid "Salary Structure"
-msgstr ""
+msgstr "Estructura salarial"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
diff --git a/addons/hr_payroll_account/security/ir.model.access.csv b/addons/hr_payroll_account/security/ir.model.access.csv
index d71b8404a12..32f98a3a9ff 100644
--- a/addons/hr_payroll_account/security/ir.model.access.csv
+++ b/addons/hr_payroll_account/security/ir.model.access.csv
@@ -1,2 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_payslip_account_move_user","access.hr.payslip.account.move.user","model_hr_payslip_account_move","base.group_user",1,0,0,0
+"access_hr_payslip_user","access.hr.payslip.user","model_hr_payslip","base.group_user",1,0,0,0
+"access_hr_payslip_line_user","access.hr.payslip.line.user","model_hr_payslip_line","base.group_user",1,0,0,0
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index 0cf34e36de4..fee3e4e8b78 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -38,7 +38,7 @@
           </xpath>
         </field>
     </record>
-    <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
+    <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
     <menuitem
         action="hr.open_board_hr_manager"
         icon="terp-graph"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 7a1d418b51b..e3955002c26 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -42,6 +42,7 @@
         <field name="arch" type="xml">
             <tree string="Applicants" colors="grey:state in ('cancel','done');blue:state=='pending'">
                 <field name="create_date"/>
+                <field name="name" string="Subject"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="partner_phone"/>
@@ -98,7 +99,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
                             <button string="Create Partner"
                                     name="%(action_hr_recruitment_partner_create)d"
-                                    icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}"/>
+                                    icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
                             <newline/>
                             <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
                             <field name="email_from" colspan="3"/>
diff --git a/addons/hr_recruitment/i18n/es.po b/addons/hr_recruitment/i18n/es.po
index 16a5bf2b162..4a7951e751c 100644
--- a/addons/hr_recruitment/i18n/es.po
+++ b/addons/hr_recruitment/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: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 08:26+0000\n"
+"PO-Revision-Date: 2010-12-28 13:09+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_recruitment
@@ -63,7 +63,7 @@ msgstr "Fecha próxima acción"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Jobs"
-msgstr ""
+msgstr "Trabajos"
 
 #. module: hr_recruitment
 #: field:hr.applicant,company_id:0
@@ -80,7 +80,7 @@ msgstr "Email de los observadores"
 #. module: hr_recruitment
 #: field:hr.recruitment.partner.create,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Cerrar petición de trabajo"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
@@ -95,7 +95,7 @@ msgstr "Objetivos"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,partner_address_id:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "Nombre contacto de empresa"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -108,7 +108,7 @@ msgstr "Crear empresa"
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -143,28 +143,28 @@ msgstr "Próximas acciones"
 #. module: hr_recruitment
 #: model:crm.case.categ,name:hr_recruitment.categ_job2
 msgid "Junior Developer"
-msgstr ""
+msgstr "Desarrollador junior"
 
 #. module: hr_recruitment
 #: field:hr.applicant,job_id:0
 #: field:hr.recruitment.report,job_id:0
 msgid "Applied Job"
-msgstr ""
+msgstr "Trabajo solicitado"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
 msgid "Graduate"
-msgstr ""
+msgstr "Diplomado/Licenciado"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
 msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Demanda inicial de trabajos"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contacto empresa"
 
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
@@ -181,7 +181,7 @@ msgstr "Estatus del candidato"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "My Recruitment"
-msgstr ""
+msgstr "Mi proceso de selección"
 
 #. module: hr_recruitment
 #: field:hr.applicant,title_action:0
@@ -196,7 +196,7 @@ msgstr "Proceso de selección"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop:0
 msgid "Salary Proposed"
-msgstr ""
+msgstr "Salario propuesto"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_id:0
@@ -208,7 +208,7 @@ msgstr "Empresa"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Avg Proposed Salary"
-msgstr ""
+msgstr "Salario propuesto promedio"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -246,7 +246,7 @@ msgstr "Siguiente"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Descripción del trabajo"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -316,7 +316,7 @@ msgstr "Apreciación"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Job"
-msgstr ""
+msgstr "Trabajo"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -335,13 +335,13 @@ msgstr "Segunda entrevista"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_exp:0
 msgid "Salary Expected"
-msgstr ""
+msgstr "Salario esperado"
 
 #. module: hr_recruitment
 #: field:hr.applicant,salary_expected:0
 #: view:hr.recruitment.report:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "Salario esperado"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -351,7 +351,7 @@ msgstr "Julio"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Subject"
-msgstr ""
+msgstr "Asunto"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -425,7 +425,7 @@ msgstr "En curso"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Trabajos - Formulario selección"
 
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
@@ -445,12 +445,12 @@ msgstr "Diciembre"
 #. module: hr_recruitment
 #: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
 msgid "HR - Recruitement"
-msgstr ""
+msgstr "RRHH - Reclutamiento"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Job Info"
-msgstr ""
+msgstr "Información del trabajo"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
@@ -476,7 +476,7 @@ msgstr "Comercial"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Search Jobs"
-msgstr ""
+msgstr "Buscar trabajos"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,category_id:0
@@ -497,7 +497,7 @@ msgstr "Muy bueno"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "# Cases"
-msgstr ""
+msgstr "Nº casos"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date_open:0
@@ -518,7 +518,7 @@ msgstr "En proceso"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Reset to New"
-msgstr ""
+msgstr "Reestablecer a nuevo"
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_expected:0
@@ -555,7 +555,7 @@ msgstr "Respuesta"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_close:0
 msgid "Avg. Delay to Close"
-msgstr ""
+msgstr "Retraso prom. hasta cierre"
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_proposed:0
@@ -603,7 +603,7 @@ msgstr "Teléfono"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC global"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -664,7 +664,7 @@ msgstr "Respuesta"
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
 msgid "Licenced"
-msgstr ""
+msgstr "Licenciado"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -676,7 +676,7 @@ msgstr "Salario promedio propuesto"
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Planificar llamada telefónica"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -692,7 +692,7 @@ msgstr "Estas personas recibirán un email."
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "Not Good"
-msgstr ""
+msgstr "No bueno"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -718,12 +718,12 @@ msgstr "Histórico"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Attachments"
-msgstr "Documentos adjuntos"
+msgstr "Adjuntos"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
 msgid "Contract Proposed"
-msgstr ""
+msgstr "Contrato propuesto"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -753,7 +753,7 @@ msgstr "Abierto"
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
 #, python-format
 msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "Ya existe una empresa con ese nombre."
 
 #. module: hr_recruitment
 #: help:hr.recruitment.degree,sequence:0
@@ -808,7 +808,7 @@ msgstr "Casos por etapa y estimaciones"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Reply"
-msgstr ""
+msgstr "Responder"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -871,7 +871,7 @@ msgstr "En promedio"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
 msgid "Degree of Recruitment"
-msgstr ""
+msgstr "Progreso del proceso de selección"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 5e343a40fa0..948c0aa0c47 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -7,3 +7,5 @@
 "access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
 "access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
 "access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
+"access_crm_phonecall_hruser","crm.phonecall hruser","crm.model_crm_phonecall","base.group_hr_user",1,1,1,1
+"access_crm_meeting_hruser","crm.meeting.hruser","crm.model_crm_meeting","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 23e30d76113..1a779fba1f9 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -14,7 +14,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="make_order" string="Create Partner" colspan="1" type="object" icon="gtk-execute"/>
+					<button name="make_order" string="Create Partner" colspan="1" type="object" icon="gtk-execute" groups="base.group_partner_manager"/>
 				</group>
 			</form>
             </field>
@@ -30,4 +30,4 @@
         </record>
 
 	</data>
-</openerp>
-\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index e33261d83fc..995fb6cce09 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:43+0000\n"
+"PO-Revision-Date: 2010-12-28 15:00+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -143,6 +143,8 @@ msgstr "kürzlich erledigte Arbeit"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+"die Leitung ausübt."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -291,6 +293,25 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung bietet in Ergänzung zur reinen Anwesenheit auch eine "
+"tabellarische Arbeitszeiterfassung ein. Jeder Mitarbeiter kann hierbei seine "
+"gearbeitetete Arbeitszeit nicht nur generell durch die Anwesenheit und "
+"Abwesenheit erfassen, sondern auch indivduell für Projekt, Aufgabe oder "
+"Konto Zeiten erfassen. Durch ein Projekt wird grundsätzlich auch ein "
+"analytische Konto angelegt auf welches diese Zeiten dann gebucht wurden.\n"
+"\n"
+"Es werden zahlreiche Auswertungen als Erweiterung für dieses Modul "
+"angeboten.\n"
+"\n"
+"Diese Anwendung ist vollständig mit den Finanz- und Kostenmodulen integriert "
+"und ermöglicht eine\n"
+"vorgangsbezogene Buchung von Zeiten.\n"
+"\n"
+"Es wurde eine vollständige Integration mit den Modulen der Finanzbuchhaltung "
+"und den Kostenmodulen\n"
+"vorgenommen.Sie können das Modul einfach per Modul\n"
+"    "
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -448,6 +469,7 @@ msgstr "November"
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index 558aa4ce717..cab9dc4f8e5 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 20:06+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 13:10+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -43,7 +42,7 @@ msgstr "¡No se ha definido un empleado para su usuario!"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -57,7 +56,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Today"
-msgstr ""
+msgstr "Hoy"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
@@ -133,6 +132,8 @@ msgstr "Trabajo realizado en el último período"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"¡Error! No puede seleccionar un departamento para el cual el empleado sea el "
+"director."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -144,7 +145,7 @@ msgstr "Estado actual"
 #: field:hr.sign.in.project,name:0
 #: field:hr.sign.out.project,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Nombre empleados"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
@@ -155,7 +156,7 @@ msgstr ""
 #: code:addons/hr_timesheet/hr_timesheet.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
@@ -185,7 +186,7 @@ msgstr "Cuenta analítica"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Aviso"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
@@ -256,7 +257,7 @@ msgstr "Fecha de inicio"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Categorías"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -418,7 +419,7 @@ msgstr "marzo"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -430,7 +431,7 @@ msgstr "Noviembre"
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
@@ -477,7 +478,7 @@ msgstr ""
 #: field:hr.sign.in.project,emp_id:0
 #: field:hr.sign.out.project,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "ID empleado"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -526,13 +527,13 @@ msgstr "febrero"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Information"
-msgstr ""
+msgstr "Información"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,employee_id:0
 #: model:ir.model,name:hr_timesheet.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Empleado"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -549,7 +550,7 @@ msgstr "Fecha actual"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Anlytic account"
-msgstr ""
+msgstr "Cuenta analítica"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -565,7 +566,7 @@ msgstr "Producto"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturación"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -622,7 +623,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -685,12 +686,12 @@ msgstr "Año"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilidad"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner Id"
-msgstr ""
+msgstr "Id empresa"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 404876b029d..4d1d5f428cf 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -35,10 +35,10 @@ def lengthmonth(year, month):
 
 class report_custom(report_rml):
 
-    def get_month_name(self, cr, uid, month):
+    def get_month_name(self, cr, uid, month, context=None):
         _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):
+    def get_weekday_name(self, cr, uid, weekday, context=None):
         _weekdays = {1:_('Mon'), 2:_('Tue'), 3:_('Wed'), 4:_('Thu'), 5:_('Fri'), 6:_('Sat'), 7:_('Sun')}
         return _weekdays[weekday]
 
@@ -54,8 +54,8 @@ class report_custom(report_rml):
         som = datetime.date(data['form']['year'], data['form']['month'], 1)
         eom = som + datetime.timedelta(lengthmonth(som.year, som.month))
 
-        date_xml = ['<date month="%s" year="%d" />' % (self.get_month_name(cr, uid, som.month), som.year), '<days>']
-        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 = ['<date month="%s" year="%d" />' % (self.get_month_name(cr, uid, som.month, context=context), som.year), '<days>']
+        date_xml += ['<day number="%d" name="%s" weekday="%d" />' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1, context=context), 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)))
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index f7f78d72fd7..e6b366d627a 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -68,11 +68,11 @@ def emp_create_xml(cr, id, som, eom, emp):
 
 class report_custom(report_rml):
 
-    def get_month_name(self, cr, uid, month):
+    def get_month_name(self, cr, uid, month, context=None):
         _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):
+    def get_weekday_name(self, cr, uid, weekday, context=None):
         _weekdays = {1:_('Mon'), 2:_('Tue'), 3:_('Wed'), 4:_('Thu'), 5:_('Fri'), 6:_('Sat'), 7:_('Sun')}
         return _weekdays[weekday]
 
@@ -81,8 +81,8 @@ class report_custom(report_rml):
         # 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))
-        date_xml = ['<date month="%s" year="%d" />' % (self.get_month_name(cr, uid, som.month), som.year), '<days>']
-        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 = ['<date month="%s" year="%d" />' % (self.get_month_name(cr, uid, som.month, context=context), som.year), '<days>']
+        date_xml += ['<day number="%d" name="%s" weekday="%d" />' % (x, self.get_weekday_name(cr, uid, som.replace(day=x).weekday()+1, context=context), 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)))
 
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 40ac84200ef..50c71564f32 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -6,3 +6,5 @@
 "access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,1,1,1
 "access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,1,1,1
 "access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
+"hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
+"hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 54d82ed2c79..215c98c02ac 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -52,7 +52,6 @@ class account_analytic_account(osv.osv):
             account_to_invoice_map.setdefault(rec['account_id'], []).append(rec['invoice_id'])
 
         for account in self.browse(cr, uid, ids, context=context):
-            invoiced = {}
             invoice_ids = filter(None, list(set(account_to_invoice_map.get(account.id, []))))
             for invoice in obj_invoice.browse(cr, uid, invoice_ids, context=context):
                 res.setdefault(account.id, 0.0)
@@ -77,6 +76,19 @@ class account_analytic_account(osv.osv):
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
     }
+    
+    def set_close(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state':'close'}, context=context)
+    
+    def set_cancel(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+    
+    def set_open(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state':'open'}, context=context)
+      
+    def set_pending(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state':'pending'}, context=context)
+
 account_analytic_account()
 
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 4b4d36bd448..df23aaae3b8 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -14,8 +14,14 @@
                         <field name="to_invoice" widget="selection" />
                         <field name="amount_max"/>
                         <field name="amount_invoiced"/>
-                        <separator colspan="4" string="State"/>
-                        <field name="state"/>
+                        <separator colspan="4"/>
+                        <group col="9" colspan="8">
+	                        <field name="state" readonly="1"/>
+	                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+	                        <button name="set_open" string="Reactivate Account" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
+	                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+	                        <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
+                        </group>
                     </group>
                 </field>
             </field>
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index 145db842584..4df2a51909f 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:17+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 15:07+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -181,7 +182,7 @@ msgstr "Betrag"
 #. module: hr_timesheet_invoice
 #: view:board.board:0
 msgid "Uninvoice Lines With Billing Rate"
-msgstr ""
+msgstr "Offene Positionen mit Abrechnungsfaktor"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,name:0
@@ -280,7 +281,7 @@ msgstr "Partner"
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Analytische Konten definieren."
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,time:0
@@ -393,6 +394,10 @@ msgid ""
 "revenue\n"
 "reports, eso."
 msgstr ""
+"\n"
+"Anwendung für die Abrechnung von Personalspesen auf Basis bereits erfasster "
+"Kostendaten (Personalspesen, Auslagen etc.). Sie können außerdem diverse "
+"Preislisten bei analytischen Konten für den Verkauf zuweisen."
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index 88061eefaac..0ca39dbe1b6 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-10-30 15:43+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 13:03+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -59,7 +58,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 días    "
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -69,7 +68,7 @@ msgstr "Ingreso"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "A facturar"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
@@ -83,7 +82,7 @@ msgstr "Hoja de servicios por día"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,name:0
@@ -109,7 +108,7 @@ msgstr ""
 #: view:report_timesheet.account.date:0
 #: view:report_timesheet.user:0
 msgid "This Year"
-msgstr ""
+msgstr "Este año"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,time:0
@@ -119,13 +118,13 @@ msgstr "Mostrar tiempo en el historial de trabajos"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Journals"
-msgstr ""
+msgstr "Diarios"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: hr_timesheet_invoice
 #: field:random.timesheet.lines,uom_id:0
@@ -136,7 +135,7 @@ msgstr "UdM"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Account"
-msgstr ""
+msgstr "Cuenta"
 
 #. module: hr_timesheet_invoice
 #: view:report.random.timesheet:0
@@ -217,7 +216,7 @@ msgstr ""
 #: view:random.timesheet.lines:0
 #: view:report.timesheet.line:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -234,7 +233,7 @@ msgstr "Hoja de servicios diaria por cuenta"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Final invoice for analytic account"
-msgstr ""
+msgstr "Factura final para la cuenta analítica"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
@@ -261,7 +260,7 @@ msgstr "Fecha límite"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "Cuentas a facturar"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
@@ -271,7 +270,7 @@ msgstr "Empresa"
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "¡Error! No se pueden crear cuentas analíticas recursivas."
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,time:0
@@ -341,7 +340,7 @@ msgstr "Empleado"
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
 msgid "It allows to set the discount while making invoice"
-msgstr ""
+msgstr "Permite establecer el descuento al facturar"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,price:0
@@ -353,7 +352,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,customer_name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
@@ -369,7 +368,7 @@ msgstr "¡Error!"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
 msgid "Gratis"
-msgstr ""
+msgstr "Gratis"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,description:hr_timesheet_invoice.module_meta_information
@@ -416,7 +415,7 @@ msgstr "Mostrar detalle del trabajo en la línea de factura."
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_random_timesheet
@@ -480,7 +479,7 @@ msgstr "Descuento (%)"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
 msgid "Yes (100%)"
-msgstr ""
+msgstr "Sí (100%)"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -500,7 +499,7 @@ msgstr "Facturas"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,month:0
@@ -547,7 +546,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,invoice_id:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Facturado"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity_max:0
@@ -587,7 +586,7 @@ msgstr "Periodo hasta"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Línea analítica"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -596,7 +595,7 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -608,7 +607,7 @@ msgstr "Costo contable"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -617,7 +616,7 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,date:0
@@ -657,12 +656,12 @@ msgstr "Por favor rellene el campo dirección de la empresa: %s."
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,amount_invoice:0
@@ -683,7 +682,7 @@ msgstr "Facturar las líneas analíticas"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "Cód. diario/Nombre mov."
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -697,7 +696,7 @@ msgstr "Total:"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -745,7 +744,7 @@ msgstr "Cantidad"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Fecha/Código"
 
 #. module: hr_timesheet_invoice
 #: view:random.timesheet.lines:0
@@ -796,7 +795,7 @@ msgstr "Precio máx. factura"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,invoice_id:0
@@ -819,7 +818,7 @@ msgstr "Cancelar"
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
 #: view:report.timesheet.line:0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Línea de hoja de asistencia"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
@@ -830,7 +829,7 @@ msgstr "Producto de balance necesario"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Billing Data"
-msgstr ""
+msgstr "Datos facturación"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
@@ -844,12 +843,12 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,customer_name:0
 msgid "Label for the customer"
-msgstr ""
+msgstr "Etiqueta para el cliente"
 
 #. module: hr_timesheet_invoice
 #: view:random.timesheet.lines:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
@@ -869,7 +868,7 @@ msgstr "Líneas hoja de servicios aleatorias"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,price:0
@@ -946,7 +945,7 @@ msgstr "A facturar"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,journal_ids:0
@@ -981,12 +980,12 @@ msgstr "Este mes"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_random_timesheet_lines_board
 msgid "Working Hours"
-msgstr ""
+msgstr "Horario de trabajo"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
 msgid "Select Period"
-msgstr ""
+msgstr "Seleccionar periodo"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -1000,7 +999,7 @@ msgstr "Periodo desde fecha inicial"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
@@ -1020,7 +1019,7 @@ msgstr "Precio venta"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,name:0
@@ -1030,7 +1029,7 @@ msgstr ""
 #: field:report_timesheet.account.date,name:0
 #: field:report_timesheet.user,name:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
@@ -1044,7 +1043,7 @@ msgstr "Hojas de servicios por día"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -1054,7 +1053,7 @@ msgstr "Datos facturación"
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,factor:0
 msgid "Discount in percentage"
-msgstr ""
+msgstr "Descuento en porcentaje"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index ff66e1a2014..f9332bf0e77 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-25 19:48+0000\n"
+"PO-Revision-Date: 2010-12-28 08:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -54,6 +54,8 @@ msgid ""
 "This lists show you every task work you can invoice to the customer. Select "
 "the lines in order to generate the invoices automatically."
 msgstr ""
+"Questo elenco vi mostra tutte le attività lavorative che sono fatturabili al "
+"cliente. Selezionare le linee in modo da generare automaticamente le fatture."
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -95,6 +97,8 @@ msgid ""
 "The product to invoice is defined on the employee form, the price will be "
 "deduced by this pricelist on the product."
 msgstr ""
+"Il prodotto da fatturare è definito nella scheda dell'impiegato, il prezzo "
+"verrà, di conseguenza, dedotto dal listino del prodotto."
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
@@ -211,6 +215,11 @@ msgid ""
 "customer. From this menu, you can create additional default types of "
 "invoicing that will speed up your invoicing."
 msgstr ""
+"OpenERP vi permette di creare tipi di fatture default. Vi può servire nel "
+"caso creiate regolermente scontistiche basandovi su contratti specifici "
+"oppure da accordi con il cliente. Da questo menù, è possibile creare "
+"ulteriori tipi di fattura default per velocizzare ulteriormente la vostra "
+"fatturazione."
 
 #. module: hr_timesheet_invoice
 #: view:random.timesheet.lines:0
@@ -233,7 +242,7 @@ msgstr "Orari di Lavoro giornalieri da Contabilità"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Final invoice for analytic account"
-msgstr ""
+msgstr "Fattura finale per conto analitico"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index 75a68403f71..dc8ca538d57 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 15:25+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -309,6 +310,33 @@ msgid ""
 "* Maximal difference between timesheet and attendances\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung hilft bei der Erfassung, Prüfung und Genehmigung von "
+"Anwesenheit und\n"
+"Arbeitszeit innerhalb einer einzigen Ansicht. Im oberen Teil der Ansicht "
+"sehen Sie die Anwesenheit, die\n"
+"durch Anmelden und Abmelden erfasst wird. Der untere Bereich ist für die "
+"Zeiterfassung vorgesehen.\n"
+"\n"
+"Der zweite Aktenreiter beinhaltet eine Statistik zur Prüfung der "
+"vollständigen Erfassung von Zeiten einzelner\n"
+"Mitarbeiter oder des Teams:\n"
+"* Anwesenheitszeit je Tag\n"
+"* Arbeitszeit je Tag (nach Projekten, Konten etc.)\n"
+"\n"
+"Ausserdem ermöglicht die Anwendung einen komplett durchgängigen Vorgang für "
+"die Eingabe von Zeiten \n"
+"bis hin zur Prüfung und Freigabe:\n"
+"* Regelmässige Zeiterfassung durch den Mitarbeiter während der Periode "
+"(Status Entwurf)\n"
+"* Bestätigung der erfassten Zeiten durch den Mitarbeiter zum Periodenende\n"
+"* Prüfung und Freigabe durch den Projektmanager\n"
+"\n"
+"Die Eingabe, Prüfung und Freigabe kann dabei je Unternehmen individualisiert "
+"werden:\n"
+"* Periodendauer des Unternehmens (Tag, Woche, Monat, Jahr)\n"
+"* Maximal akzeptierte Abweichung zwischen Anwesenheit und Arbeitszeit u.a.\n"
+"    "
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
@@ -446,7 +474,7 @@ msgstr "Gesamte Projektzeit"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Anwesenheitszeit"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -764,7 +792,7 @@ msgstr "Zeiterfassung nach Konten"
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
 #, python-format
 msgid "Open Timesheet"
-msgstr ""
+msgstr "Öffne Zeiterfassung"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index 50cc631ec1a..c2f0f641547 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 20:04+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 13:10+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -40,7 +39,7 @@ msgstr "Hoja"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Servicio"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
@@ -53,7 +52,7 @@ msgstr "¡No se ha definido un empleado para su usuario!"
 #: view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
@@ -67,7 +66,7 @@ msgstr "Total servicio"
 #: view:timesheet.report:0
 #: field:timesheet.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Departamento"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
@@ -92,7 +91,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -101,7 +100,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -152,7 +151,7 @@ msgstr "Presente"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Coste total"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -194,12 +193,12 @@ msgstr "No puede registrar entrada en otra fecha que no sea hoy"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mes-1 "
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validation"
-msgstr ""
+msgstr "Validación"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -241,7 +240,7 @@ msgstr "Fecha desde"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month "
-msgstr ""
+msgstr " Mes "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -303,24 +302,24 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No se pueden crear compañías recursivas."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 #: view:timesheet.report:0
 #: field:timesheet.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "State is 'confirmed'."
-msgstr ""
+msgstr "El estado es 'confirmado'"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Empleado"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -359,7 +358,7 @@ msgstr "Líneas de la hoja de asistencia"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Hours"
-msgstr ""
+msgstr "Horas"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -371,6 +370,8 @@ msgstr ""
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Error: Registro de entrada (resp. Registro de salida) debe seguir al "
+"Registro de salida (resp. Registro de entrada)"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -392,7 +393,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -459,13 +460,13 @@ msgstr "Ir a:"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -490,7 +491,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "En borrador"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -500,7 +501,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Billing"
-msgstr ""
+msgstr "Cobros"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
@@ -555,7 +556,7 @@ msgstr ""
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Year "
-msgstr ""
+msgstr " Año "
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -566,13 +567,13 @@ msgstr "Semana"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -615,13 +616,13 @@ msgstr "Fecha"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
@@ -642,13 +643,13 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -658,12 +659,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -671,7 +672,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Cuenta general"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -711,22 +712,22 @@ msgstr "Realizado"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "State is 'draft'."
-msgstr ""
+msgstr "El estado es 'borrador'"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "Validado"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Open"
-msgstr ""
+msgstr "Abierto"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -748,7 +749,7 @@ msgstr "¡No se puede(n) eliminar hoja(s) que ya está(n) confirmada(s)!"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "State is 'validated'."
-msgstr ""
+msgstr "El estado es 'validado'"
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -792,7 +793,7 @@ msgstr "Línea hoja de servicios"
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -817,7 +818,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
@@ -867,12 +868,12 @@ msgstr "Ausente"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -883,12 +884,12 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmación"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -903,7 +904,7 @@ msgstr "Facturar sobre trabajo"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprobar"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -914,7 +915,7 @@ msgstr "Cuentas analíticas"
 #: view:timesheet.report:0
 #: field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "Tipo de facturación"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -933,7 +934,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Coste"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index aee75447059..68e07631695 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.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: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-25 14:29+0000\n"
+"PO-Revision-Date: 2010-12-28 08:33+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -169,6 +169,8 @@ msgstr "Rifiuta"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
+"Non è possibile inserire una data di presenza che sta al di fuori del range "
+"di date per l'attuale timesheet!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -185,7 +187,7 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
 msgid "You can not sign in from an other date than today"
-msgstr ""
+msgstr "Non è possibile registrare una entrata in un giorno diverso da oggi"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -207,7 +209,7 @@ msgstr "Attenzione !"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Voce del timesheet impiegato"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -334,7 +336,7 @@ msgstr "Non è possibile duplicare un timesheet!"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
-msgstr ""
+msgstr "La mia presenza totale per settimana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -362,7 +364,7 @@ msgstr "Ore"
 #: view:timesheet.report:0
 #: field:timesheet.report,cost:0
 msgid "#Cost"
-msgstr ""
+msgstr "# Costo"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -385,7 +387,7 @@ msgstr "Azione non valida!"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "Il Manager di progetto convalita i timesheet."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -411,7 +413,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
-msgstr ""
+msgstr "Lavoro sull'attività"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -433,7 +435,7 @@ msgstr "Orari di Lavoro Totali"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Presenza media"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -509,6 +511,8 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
+"La linea del timesheet rappresenta il tempo speso dall'impiegato su di uno "
+"specifico servizio fornito."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -639,7 +643,7 @@ msgstr "Righe Orari di Lavoro"
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "La mia presenza totale per settimana"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -674,7 +678,7 @@ msgstr "Quantità"
 #: view:timesheet.report:0
 #: field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Contabilità Generale"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -785,6 +789,8 @@ msgid ""
 "The timesheet cannot be validated as it does not contain equal no. of sign "
 "ins and sign outs!"
 msgstr ""
+"Il timesheet non può essere convalidato perchè non contiene un egual numero "
+"di entrate ed uscite!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -827,7 +833,7 @@ msgstr "Maggio"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
 msgid "Defines the work summary of task"
-msgstr ""
+msgstr "Definisce un riepilogo lavoro sull'attività"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -882,7 +888,7 @@ msgstr "Impiegati"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Information of time spent on a service"
-msgstr ""
+msgstr "Informazione del tempo speso su di un servizio"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -919,13 +925,13 @@ msgstr "Contabilità Analitica"
 #: view:timesheet.report:0
 #: field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "Tipo di fatturazione"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
 #: field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "# Presenza totale"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index f55ee0fb5e0..9d0159bbc1a 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -6,4 +6,3 @@
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
 "access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
-"access_timesheet_report_user","timesheet.report.user","model_timesheet_report","base.group_hr_manager",1,1,1,1
diff --git a/addons/html_view/i18n/de.po b/addons/html_view/i18n/de.po
index dac721c07b2..cd99ea33430 100644
--- a/addons/html_view/i18n/de.po
+++ b/addons/html_view/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:14+0000\n"
+"PO-Revision-Date: 2010-12-28 15:28+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
@@ -57,6 +57,10 @@ msgid ""
 "view.\n"
 "    "
 msgstr ""
+"\n"
+"    Diese Anwendung zeigt einen Test der html tag Unterstützung in normalen "
+"xml basierten Ansichten.\n"
+"    "
 
 #. module: html_view
 #: model:ir.model,name:html_view.model_html_view
diff --git a/addons/html_view/i18n/es.po b/addons/html_view/i18n/es.po
index 2dbf6a90771..804d9585856 100644
--- a/addons/html_view/i18n/es.po
+++ b/addons/html_view/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 23:20+0000\n"
+"PO-Revision-Date: 2010-12-27 09:12+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
diff --git a/addons/idea/i18n/es.po b/addons/idea/i18n/es.po
index 89d3e6bfe09..ecbea70b860 100644
--- a/addons/idea/i18n/es.po
+++ b/addons/idea/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:51+0000\n"
+"PO-Revision-Date: 2010-12-27 08:08+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/knowledge/i18n/es.po b/addons/knowledge/i18n/es.po
index 04bf6cf08f8..ed4285f37f5 100644
--- a/addons/knowledge/i18n/es.po
+++ b/addons/knowledge/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:44+0000\n"
+"PO-Revision-Date: 2010-12-27 08:12+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/security/ir.model.access.csv b/addons/knowledge/security/ir.model.access.csv
index d111677a4d3..7a057fcfcbe 100644
--- a/addons/knowledge/security/ir.model.access.csv
+++ b/addons/knowledge/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_ir_attachment_sale_manager","ir_attachment manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
 "access_ir_attachment_partner_manager","ir_attachment_partner manager","base.model_ir_attachment","base.group_partner_manager",1,1,1,1
+
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index f6cffce6b12..c1406982da9 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-10-30 09:26+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 08:32+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
@@ -26,7 +25,7 @@ msgstr "Niveles - Recibible"
 #: field:l1on_be.vat.declaration,tax_code_id:0
 #: field:partner.vat.intra,tax_code_id:0
 msgid "Tax Code"
-msgstr ""
+msgstr "Código impuesto"
 
 #. module: l10n_be
 #: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_3
@@ -54,7 +53,7 @@ msgstr "Inmovilización"
 #: view:l1on_be.vat.declaration:0
 #: view:partner.vat.intra:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers_payable
@@ -69,7 +68,7 @@ msgstr ""
 #. module: l10n_be
 #: field:vat.listing.clients,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Cantidad"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -92,7 +91,7 @@ msgstr ""
 #. module: l10n_be
 #: field:vat.listing.clients,vat:0
 msgid "VAT"
-msgstr ""
+msgstr "IVA"
 
 #. module: l10n_be
 #: field:vat.listing.clients,turnover:0
@@ -155,7 +154,7 @@ msgstr "Régimen Nacional"
 #. module: l10n_be
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: l10n_be
 #: help:partner.vat,test_xml:0
@@ -180,7 +179,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
 #, python-format
 msgid "Save"
-msgstr ""
+msgstr "Guardar"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -227,7 +226,7 @@ msgstr ""
 #: view:partner.vat.list:0
 #: field:partner.vat.list,partner_ids:0
 msgid "Clients"
-msgstr ""
+msgstr "Clientes"
 
 #. module: l10n_be
 #: field:partner.vat,test_xml:0
@@ -307,7 +306,7 @@ msgstr "Cantidad límite"
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: l10n_be
 #: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
@@ -356,7 +355,7 @@ msgstr ""
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Periods"
-msgstr ""
+msgstr "Periodos"
 
 #. module: l10n_be
 #: view:partner.vat:0
@@ -368,7 +367,7 @@ msgstr "Cancelar"
 #: view:partner.vat.intra:0
 #: view:partner.vat.list:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: l10n_be
 #: field:partner.vat.intra,period_ids:0
@@ -460,7 +459,7 @@ msgstr ""
 #. module: l10n_be
 #: field:vat.listing.clients,country:0
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: l10n_be
 #: field:partner.vat,fyear:0
@@ -500,7 +499,7 @@ msgstr ""
 #: field:partner.vat.intra,name:0
 #: field:partner.vat.list,name:0
 msgid "File Name"
-msgstr ""
+msgstr "Nombre de archivo"
 
 #. module: l10n_be
 #: field:partner.vat.intra,period_code:0
diff --git a/addons/l10n_be/security/ir.model.access.csv b/addons/l10n_be/security/ir.model.access.csv
index de2c3f15547..0343f29f43a 100644
--- a/addons/l10n_be/security/ir.model.access.csv
+++ b/addons/l10n_be/security/ir.model.access.csv
@@ -1,4 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_l10n_be_vat_declaration_manager","l1on.be.vat.declaration manager","model_l1on_be_vat_declaration","account.group_account_manager",1,1,1,1
-"access_partner_vat_intra_manager","partner.vat.intra manager","model_partner_vat_intra","account.group_account_manager",1,1,1,1
-"access_partner_vat_manager","partner.vat manager","model_partner_vat","account.group_account_manager",1,1,1,1
diff --git a/addons/l10n_ca/__init__.py b/addons/l10n_ca/__init__.py
index 24ab202267f..24ab202267f 100755..100644
--- a/addons/l10n_ca/__init__.py
+++ b/addons/l10n_ca/__init__.py
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 9526eaba373..9526eaba373 100755..100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
diff --git a/addons/l10n_ca/i18n/es.po b/addons/l10n_ca/i18n/es.po
new file mode 100644
index 00000000000..54d327302b0
--- /dev/null
+++ b/addons/l10n_ca/i18n/es.po
@@ -0,0 +1,129 @@
+# Spanish 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: 2010-08-02 21:08+0000\n"
+"PO-Revision-Date: 2010-12-28 09:19+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-29 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_receivable
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_asset_view
+msgid "Asset View"
+msgstr ""
+
+#. module: l10n_ca
+#: model:ir.module.module,description:l10n_ca.module_meta_information
+msgid ""
+"This is the module to manage the canadian accounting chart in OpenERP."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_expense_view
+msgid "Expense View"
+msgstr ""
+
+#. module: l10n_ca
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "¡ Error ! No puede crear plantillas de cuentas recursivas."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_income_view
+msgid "Income View"
+msgstr ""
+
+#. module: l10n_ca
+#: model:ir.module.module,shortdesc:l10n_ca.module_meta_information
+msgid "Canada - Chart of Accounts"
+msgstr ""
+
+#. module: l10n_ca
+#: constraint:account.account.type:0
+msgid "Error ! You can not create recursive types."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_tax
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_cash
+msgid "Cash"
+msgstr "Caja"
+
+#. module: l10n_ca
+#: model:ir.actions.todo,note:l10n_ca.config_call_account_template_ca
+msgid ""
+"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.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
+"el número de dígitos para generar el código de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_equity
+msgid "Equity"
+msgstr "Patrimonio"
+
+#. module: l10n_ca
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "¡ Error ! No puede crear códigos de impuestos recursivos."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_liability_view
+msgid "Liability View"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_expense
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_view
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_ch/i18n/es.po b/addons/l10n_ch/i18n/es.po
index 5c0b4408955..27d7ba8a9ff 100644
--- a/addons/l10n_ch/i18n/es.po
+++ b/addons/l10n_ch/i18n/es.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:15+0000\n"
-"PO-Revision-Date: 2010-10-30 11:21+0000\n"
-"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
+"PO-Revision-Date: 2010-12-28 08:53+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
 msgid "Tax Code"
-msgstr ""
+msgstr "Código impuesto"
 
 #. module: l10n_ch
 #: view:bvr.invoices.report:0
@@ -131,7 +131,7 @@ msgstr ""
 #. module: l10n_ch
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_bvr_report
@@ -178,6 +178,8 @@ msgstr ""
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
+"una empresa."
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/bvr_import.py:0
@@ -188,7 +190,7 @@ msgstr "¡Registro total diferente del calculado!"
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/bvr_report.py:0
@@ -229,7 +231,7 @@ msgstr ""
 #. module: l10n_ch
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -241,7 +243,7 @@ msgstr "Sin IBAN en la cuenta bancaria de la compañía."
 #: view:bvr.invoices.report:0
 #: view:bvr.report:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -424,7 +426,7 @@ msgstr "Importar"
 #. module: l10n_ch
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Error: Número BVR inválido (checksum erróneo)."
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_non_ope_debts
@@ -473,12 +475,12 @@ msgstr ""
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Apuntes"
 
 #. module: l10n_ch
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
 
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/create_dta.py:0
@@ -508,7 +510,7 @@ msgstr "Parte ordenante DTA"
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: l10n_ch
 #: model:res.partner.title,name:l10n_ch.res_c_partner_title_madame
@@ -562,7 +564,7 @@ msgstr "Localización Suiza corregida por Camptocamp"
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Cuentas bancarias"
 
 #. module: l10n_ch
 #: view:create.dta.wizard:0
@@ -611,7 +613,7 @@ msgstr "post_number"
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_payment_order
 msgid "Payment Order"
-msgstr ""
+msgstr "Orden de pago"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_report_result
@@ -656,7 +658,7 @@ msgstr ""
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_res_bank
 msgid "Bank"
-msgstr ""
+msgstr "Banco"
 
 #. module: l10n_ch
 #: model:res.partner.title,shortcut:l10n_ch.res_c_partner_title_mme_m
@@ -673,7 +675,7 @@ msgstr "DTA-BVRBANK"
 #: field:bvr.invoices.report,name:0
 #: field:bvr.report,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: l10n_ch
 #: model:account.account.type,name:l10n_ch.account_type_consolidation
@@ -779,7 +781,7 @@ msgstr ""
 #. module: l10n_ch
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
 
 #~ msgid "The VAT doesn't seem to be correct."
 #~ msgstr "El CIF/NIF no parece estar correcto."
diff --git a/addons/l10n_ch/readme.txt b/addons/l10n_ch/readme.txt
index c02e5d27103..c02e5d27103 100755..100644
--- a/addons/l10n_ch/readme.txt
+++ b/addons/l10n_ch/readme.txt
diff --git a/addons/l10n_ch/report/bvr_invoice_report.rml b/addons/l10n_ch/report/bvr_invoice_report.rml
index ee69eedee2e..ee69eedee2e 100755..100644
--- a/addons/l10n_ch/report/bvr_invoice_report.rml
+++ b/addons/l10n_ch/report/bvr_invoice_report.rml
diff --git a/addons/l10n_ch/report/bvr_report.rml b/addons/l10n_ch/report/bvr_report.rml
index c20e3371a41..c20e3371a41 100755..100644
--- a/addons/l10n_ch/report/bvr_report.rml
+++ b/addons/l10n_ch/report/bvr_report.rml
diff --git a/addons/l10n_ch/report/normalized_oo2rml.xsl b/addons/l10n_ch/report/normalized_oo2rml.xsl
index 29ed854d1e0..29ed854d1e0 100755..100644
--- a/addons/l10n_ch/report/normalized_oo2rml.xsl
+++ b/addons/l10n_ch/report/normalized_oo2rml.xsl
diff --git a/addons/l10n_ch/report/ocrbb.ttf b/addons/l10n_ch/report/ocrbb.ttf
index ef8068be9c2..ef8068be9c2 100755..100644
--- a/addons/l10n_ch/report/ocrbb.ttf
+++ b/addons/l10n_ch/report/ocrbb.ttf
diff --git a/addons/l10n_ch/wizard.xml b/addons/l10n_ch/wizard.xml
index 5f77c681496..5f77c681496 100755..100644
--- a/addons/l10n_ch/wizard.xml
+++ b/addons/l10n_ch/wizard.xml
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/es.po b/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
index 1267465ab0d..e72acbbeab9 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-12-26 23:04+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 08:55+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
@@ -98,7 +97,7 @@ msgstr "Autre: Otro"
 #. module: l10n_ch_chart_c2c_pcg
 #: field:account.tax.template.todo,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progreso de la configuración"
 
 #. module: l10n_ch_chart_c2c_pcg
 #: model:account.account.type,name:l10n_ch_chart_c2c_pcg.account_type_prov_reserve
@@ -224,7 +223,7 @@ msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
 #. module: l10n_ch_chart_c2c_pcg
 #: field:account.tax.template.todo,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imagen"
 
 #. module: l10n_ch_chart_c2c_pcg
 #: model:account.account.type,name:l10n_ch_chart_c2c_pcg.account_type_lt_liability
diff --git a/addons/l10n_chart_uk_minimal/i18n/es.po b/addons/l10n_chart_uk_minimal/i18n/es.po
index 3c495187726..7a2abaacb6b 100644
--- a/addons/l10n_chart_uk_minimal/i18n/es.po
+++ b/addons/l10n_chart_uk_minimal/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-09-29 10:03+0000\n"
+"PO-Revision-Date: 2010-12-28 08:52+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
@@ -71,7 +71,7 @@ msgstr "Efectivo"
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_liability
 msgid "Liability"
-msgstr ""
+msgstr "Pasivo"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_payable
diff --git a/addons/l10n_de/__init__.py b/addons/l10n_de/__init__.py
index 6c665b5e823..6c665b5e823 100755..100644
--- a/addons/l10n_de/__init__.py
+++ b/addons/l10n_de/__init__.py
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index d58f09e940c..d58f09e940c 100755..100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
diff --git a/addons/l10n_de/account_chart_skr03.xml b/addons/l10n_de/account_chart_skr03.xml
index 187f0259dbb..187f0259dbb 100755..100644
--- a/addons/l10n_de/account_chart_skr03.xml
+++ b/addons/l10n_de/account_chart_skr03.xml
diff --git a/addons/l10n_de/account_chart_skr04.xml b/addons/l10n_de/account_chart_skr04.xml
index 249b2b0e758..249b2b0e758 100755..100644
--- a/addons/l10n_de/account_chart_skr04.xml
+++ b/addons/l10n_de/account_chart_skr04.xml
diff --git a/addons/l10n_de/account_chart_template_skr03.xml b/addons/l10n_de/account_chart_template_skr03.xml
index 058424188f6..058424188f6 100755..100644
--- a/addons/l10n_de/account_chart_template_skr03.xml
+++ b/addons/l10n_de/account_chart_template_skr03.xml
diff --git a/addons/l10n_de/account_chart_template_skr04.xml b/addons/l10n_de/account_chart_template_skr04.xml
index cd7f5ca724b..cd7f5ca724b 100755..100644
--- a/addons/l10n_de/account_chart_template_skr04.xml
+++ b/addons/l10n_de/account_chart_template_skr04.xml
diff --git a/addons/l10n_de/account_tax_fiscal_position_skr03.xml b/addons/l10n_de/account_tax_fiscal_position_skr03.xml
index 9864683d400..9864683d400 100755..100644
--- a/addons/l10n_de/account_tax_fiscal_position_skr03.xml
+++ b/addons/l10n_de/account_tax_fiscal_position_skr03.xml
diff --git a/addons/l10n_de/account_tax_fiscal_position_skr04.xml b/addons/l10n_de/account_tax_fiscal_position_skr04.xml
index 09328428dd2..09328428dd2 100755..100644
--- a/addons/l10n_de/account_tax_fiscal_position_skr04.xml
+++ b/addons/l10n_de/account_tax_fiscal_position_skr04.xml
diff --git a/addons/l10n_de/account_tax_skr03.xml b/addons/l10n_de/account_tax_skr03.xml
index c2707502ed0..c2707502ed0 100755..100644
--- a/addons/l10n_de/account_tax_skr03.xml
+++ b/addons/l10n_de/account_tax_skr03.xml
diff --git a/addons/l10n_de/account_tax_skr04.xml b/addons/l10n_de/account_tax_skr04.xml
index 3ab1d1f8cc1..3ab1d1f8cc1 100755..100644
--- a/addons/l10n_de/account_tax_skr04.xml
+++ b/addons/l10n_de/account_tax_skr04.xml
diff --git a/addons/l10n_de/account_types_skr03.xml b/addons/l10n_de/account_types_skr03.xml
index 5967999b601..5967999b601 100755..100644
--- a/addons/l10n_de/account_types_skr03.xml
+++ b/addons/l10n_de/account_types_skr03.xml
diff --git a/addons/l10n_de/account_types_skr04.xml b/addons/l10n_de/account_types_skr04.xml
index 5967999b601..5967999b601 100755..100644
--- a/addons/l10n_de/account_types_skr04.xml
+++ b/addons/l10n_de/account_types_skr04.xml
diff --git a/addons/l10n_de/i18n/ar_AR.po b/addons/l10n_de/i18n/ar_AR.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/ar_AR.po
+++ b/addons/l10n_de/i18n/ar_AR.po
diff --git a/addons/l10n_de/i18n/be_BE.po b/addons/l10n_de/i18n/be_BE.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/be_BE.po
+++ b/addons/l10n_de/i18n/be_BE.po
diff --git a/addons/l10n_de/i18n/bg_BG.po b/addons/l10n_de/i18n/bg_BG.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/bg_BG.po
+++ b/addons/l10n_de/i18n/bg_BG.po
diff --git a/addons/l10n_de/i18n/bs_BS.po b/addons/l10n_de/i18n/bs_BS.po
index 6bcb0a8931e..6bcb0a8931e 100755..100644
--- a/addons/l10n_de/i18n/bs_BS.po
+++ b/addons/l10n_de/i18n/bs_BS.po
diff --git a/addons/l10n_de/i18n/ca_ES.po b/addons/l10n_de/i18n/ca_ES.po
index 6bcb0a8931e..6bcb0a8931e 100755..100644
--- a/addons/l10n_de/i18n/ca_ES.po
+++ b/addons/l10n_de/i18n/ca_ES.po
diff --git a/addons/l10n_de/i18n/cs_CZ.po b/addons/l10n_de/i18n/cs_CZ.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/cs_CZ.po
+++ b/addons/l10n_de/i18n/cs_CZ.po
diff --git a/addons/l10n_de/i18n/es_AR.po b/addons/l10n_de/i18n/es_AR.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/es_AR.po
+++ b/addons/l10n_de/i18n/es_AR.po
diff --git a/addons/l10n_de/i18n/es_ES.po b/addons/l10n_de/i18n/es_ES.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/es_ES.po
+++ b/addons/l10n_de/i18n/es_ES.po
diff --git a/addons/l10n_de/i18n/et_EE.po b/addons/l10n_de/i18n/et_EE.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/et_EE.po
+++ b/addons/l10n_de/i18n/et_EE.po
diff --git a/addons/l10n_de/i18n/fi_FI.po b/addons/l10n_de/i18n/fi_FI.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/fi_FI.po
+++ b/addons/l10n_de/i18n/fi_FI.po
diff --git a/addons/l10n_de/i18n/fr_FR.po b/addons/l10n_de/i18n/fr_FR.po
index 6eda62794b8..6eda62794b8 100755..100644
--- a/addons/l10n_de/i18n/fr_FR.po
+++ b/addons/l10n_de/i18n/fr_FR.po
diff --git a/addons/l10n_de/i18n/hr_HR.po b/addons/l10n_de/i18n/hr_HR.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/hr_HR.po
+++ b/addons/l10n_de/i18n/hr_HR.po
diff --git a/addons/l10n_de/i18n/hu_HU.po b/addons/l10n_de/i18n/hu_HU.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/hu_HU.po
+++ b/addons/l10n_de/i18n/hu_HU.po
diff --git a/addons/l10n_de/i18n/id_ID.po b/addons/l10n_de/i18n/id_ID.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/id_ID.po
+++ b/addons/l10n_de/i18n/id_ID.po
diff --git a/addons/l10n_de/i18n/it_IT.po b/addons/l10n_de/i18n/it_IT.po
index b51aafeb1fc..b51aafeb1fc 100755..100644
--- a/addons/l10n_de/i18n/it_IT.po
+++ b/addons/l10n_de/i18n/it_IT.po
diff --git a/addons/l10n_de/i18n/ko_KO.po b/addons/l10n_de/i18n/ko_KO.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/ko_KO.po
+++ b/addons/l10n_de/i18n/ko_KO.po
diff --git a/addons/l10n_de/i18n/lt_LT.po b/addons/l10n_de/i18n/lt_LT.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/lt_LT.po
+++ b/addons/l10n_de/i18n/lt_LT.po
diff --git a/addons/l10n_de/i18n/nl_BE.po b/addons/l10n_de/i18n/nl_BE.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/nl_BE.po
+++ b/addons/l10n_de/i18n/nl_BE.po
diff --git a/addons/l10n_de/i18n/nl_NL.po b/addons/l10n_de/i18n/nl_NL.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/nl_NL.po
+++ b/addons/l10n_de/i18n/nl_NL.po
diff --git a/addons/l10n_de/i18n/pl_PL.po b/addons/l10n_de/i18n/pl_PL.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/pl_PL.po
+++ b/addons/l10n_de/i18n/pl_PL.po
diff --git a/addons/l10n_de/i18n/pt_PT.po b/addons/l10n_de/i18n/pt_PT.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/pt_PT.po
+++ b/addons/l10n_de/i18n/pt_PT.po
diff --git a/addons/l10n_de/i18n/ro_RO.po b/addons/l10n_de/i18n/ro_RO.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/ro_RO.po
+++ b/addons/l10n_de/i18n/ro_RO.po
diff --git a/addons/l10n_de/i18n/ru_RU.po b/addons/l10n_de/i18n/ru_RU.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/ru_RU.po
+++ b/addons/l10n_de/i18n/ru_RU.po
diff --git a/addons/l10n_de/i18n/sl_SL.po b/addons/l10n_de/i18n/sl_SL.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/sl_SL.po
+++ b/addons/l10n_de/i18n/sl_SL.po
diff --git a/addons/l10n_de/i18n/sq_AL.po b/addons/l10n_de/i18n/sq_AL.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/sq_AL.po
+++ b/addons/l10n_de/i18n/sq_AL.po
diff --git a/addons/l10n_de/i18n/sv_SE.po b/addons/l10n_de/i18n/sv_SE.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/sv_SE.po
+++ b/addons/l10n_de/i18n/sv_SE.po
diff --git a/addons/l10n_de/i18n/tr_TR.po b/addons/l10n_de/i18n/tr_TR.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/tr_TR.po
+++ b/addons/l10n_de/i18n/tr_TR.po
diff --git a/addons/l10n_de/i18n/uk_UA.po b/addons/l10n_de/i18n/uk_UA.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/uk_UA.po
+++ b/addons/l10n_de/i18n/uk_UA.po
diff --git a/addons/l10n_de/i18n/vi_VN.po b/addons/l10n_de/i18n/vi_VN.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/vi_VN.po
+++ b/addons/l10n_de/i18n/vi_VN.po
diff --git a/addons/l10n_de/i18n/znd_ZND.po b/addons/l10n_de/i18n/znd_ZND.po
index 6e69243e21b..6e69243e21b 100755..100644
--- a/addons/l10n_de/i18n/znd_ZND.po
+++ b/addons/l10n_de/i18n/znd_ZND.po
diff --git a/addons/l10n_de/l10n_de_wizard.xml b/addons/l10n_de/l10n_de_wizard.xml
index 63a92fe8ae2..63a92fe8ae2 100755..100644
--- a/addons/l10n_de/l10n_de_wizard.xml
+++ b/addons/l10n_de/l10n_de_wizard.xml
diff --git a/addons/l10n_es/i18n/es.po b/addons/l10n_es/i18n/es.po
index ed95f34902d..440cd3605a6 100644
--- a/addons/l10n_es/i18n/es.po
+++ b/addons/l10n_es/i18n/es.po
@@ -7,113 +7,112 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-15 12:26+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 07:52+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_extra
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_extra
 msgid "Régimen Extracomunitario"
-msgstr ""
+msgstr "Régimen Extracomunitario"
 
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_irpf15
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf15
 msgid "Retención IRPF 15%"
-msgstr ""
+msgstr "Retención IRPF 15%"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.stock
 msgid "Existencias"
-msgstr ""
+msgstr "Existencias"
 
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_recargo
 #: model:account.fiscal.position.template,name:l10n_es.fp_recargo
 msgid "Recargo de Equivalencia"
-msgstr ""
+msgstr "Recargo de Equivalencia"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.terceros - rec
 msgid "Terceros - A Cobrar"
-msgstr ""
+msgstr "Terceros - A Cobrar"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.capital
 msgid "Capital"
-msgstr ""
+msgstr "Capital"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.terceros
 msgid "Terceros"
-msgstr ""
+msgstr "Terceros"
 
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_irpf1
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf1
 msgid "Retención IRPF 1%"
-msgstr ""
+msgstr "Retención IRPF 1%"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.terceros - pay
 msgid "Terceros - A Pagar"
-msgstr ""
+msgstr "Terceros - A Pagar"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.gastos_neto
 msgid "Gastos patrimonio neto"
-msgstr ""
+msgstr "Gastos patrimonio neto"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.tax
 msgid "Impuestos"
-msgstr ""
+msgstr "Impuestos"
 
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_irpf7
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf7
 msgid "Retención IRPF 7%"
-msgstr ""
+msgstr "Retención IRPF 7%"
 
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_nacional
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_nacional
 msgid "Régimen Nacional"
-msgstr ""
+msgstr "Régimen Nacional"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
 msgid "Inmobilizado"
-msgstr ""
+msgstr "Inmobilizado"
 
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_irpf18
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf18
 msgid "Retención IRPF 18%"
-msgstr ""
+msgstr "Retención IRPF 18%"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.ingresos
 msgid "Ingresos"
-msgstr ""
+msgstr "Ingresos"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.view
 msgid "View"
-msgstr ""
+msgstr "Vista"
 
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_intra
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_intra
 msgid "Régimen Intracomunitario"
-msgstr ""
+msgstr "Régimen Intracomunitario"
 
 #. module: l10n_es
 #: model:ir.module.module,description:l10n_es.module_meta_information
@@ -130,38 +129,49 @@ msgid ""
 "Note: You should install the l10n_ES_account_balance_report module\n"
 "for yearly account reporting (balance, profit & losses).\n"
 msgstr ""
+"Plan General Contable Español (PGCE 2008)\n"
+"\n"
+"* Define las siguientes plantillas de planes de cuentas:\n"
+"        * Plan General Contable Español 2008.\n"
+"        * Plan General Contable Español 2008 para pequeñas y medianas "
+"empresas (PYMES).\n"
+"* Define plantillas de impuestos de ventas y compras.\n"
+"* Define plantillas de códigos de impuesto.\n"
+"\n"
+"Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
+"para reportes de cuentas anuales (balance, perdidas y ganancias)\n"
 
 #. module: l10n_es
 #: model:ir.module.module,shortdesc:l10n_es.module_meta_information
 msgid "Spanish Charts of Accounts (PGCE 2008)"
-msgstr ""
+msgstr "Plan Contable Español (PGCE 2008)"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.ingresos_neto
 msgid "Ingresos patrimonio neto"
-msgstr ""
+msgstr "Ingresos patrimonio neto"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.financieras
 msgid "Financieras"
-msgstr ""
+msgstr "Financieras"
 
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_irpf19
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf19
 msgid "Retención IRPF 19%"
-msgstr ""
+msgstr "Retención IRPF 19%"
 
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_irpf2
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf2
 msgid "Retención IRPF 2%"
-msgstr ""
+msgstr "Retención IRPF 2%"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.gastos
 msgid "Gastos"
-msgstr ""
+msgstr "Gastos"
 
 #~ msgid "Error ! You can not create recursive account templates."
 #~ msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index bbb19811cfb..93e6d51a4bc 100644
--- a/addons/l10n_fr/i18n/es.po
+++ b/addons/l10n_fr/i18n/es.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: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 08:57+0000\n"
+"PO-Revision-Date: 2010-12-28 09:12+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
@@ -67,7 +67,7 @@ msgstr "Imprimir"
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_account_bilan_report
 msgid "Account Bilan Report"
-msgstr ""
+msgstr "Estado de situación patrimonial"
 
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_l10n_fr_report
diff --git a/addons/l10n_gr/account_chart.xml b/addons/l10n_gr/account_chart.xml
index 0ad5579d867..0ad5579d867 100755..100644
--- a/addons/l10n_gr/account_chart.xml
+++ b/addons/l10n_gr/account_chart.xml
diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml
index 133a816d0be..133a816d0be 100755..100644
--- a/addons/l10n_gr/account_tax.xml
+++ b/addons/l10n_gr/account_tax.xml
diff --git a/addons/l10n_gr/i18n/es.po b/addons/l10n_gr/i18n/es.po
new file mode 100644
index 00000000000..802e2649216
--- /dev/null
+++ b/addons/l10n_gr/i18n/es.po
@@ -0,0 +1,98 @@
+# Spanish 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: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-28 09:07+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-29 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_receivable
+msgid "Receivable"
+msgstr "A cobrar"
+
+#. module: l10n_gr
+#: model:ir.module.module,description:l10n_gr.module_meta_information
+msgid "This is the base module to manage the accounting chart for Greece."
+msgstr "Este es el módulo base para gestionar el plan contable para Grecia."
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_tax
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: l10n_gr
+#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
+msgid "Greece - minimal"
+msgstr "Grecia - mínimo"
+
+#. module: l10n_gr
+#: model:ir.actions.todo,note:l10n_gr.config_call_account_template_gr
+msgid ""
+"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.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
+"el número de dígitos para generar el código de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_cash
+msgid "Cash"
+msgstr "Caja"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_other
+msgid "Other"
+msgstr "Otro"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_equity
+msgid "Equity"
+msgstr "Patrimonio"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_expense
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_gr
+#: model:account.account.type,name:l10n_gr.account_type_view
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_in/i18n/es.po b/addons/l10n_in/i18n/es.po
new file mode 100644
index 00000000000..51aa548307d
--- /dev/null
+++ b/addons/l10n_in/i18n/es.po
@@ -0,0 +1,96 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 15:28+0000\n"
+"PO-Revision-Date: 2010-12-27 11:00+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-28 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,description:l10n_chart_in.module_meta_information
+msgid ""
+"\n"
+"    Indian Accounting : chart of Account\n"
+"    "
+msgstr ""
+
+#. module: l10n_chart_in
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "¡ Error ! No puede crear plantillas de cuentas recursivas."
+
+#. module: l10n_chart_in
+#: model:account.journal,name:l10n_chart_in.opening_journal
+msgid "Opening Journal"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
+msgid ""
+"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.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
+"el número de dígitos para generar el código de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_liability1
+msgid "Liability"
+msgstr "Pasivo"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_asset1
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_closed1
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_income1
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_chart_in
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "¡ Error ! No puede crear códigos de impuestos recursivos."
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_expense1
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_chart_in
+#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information
+msgid "Indian Chart of Account"
+msgstr ""
+
+#. module: l10n_chart_in
+#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_in/i18n/fr.po b/addons/l10n_in/i18n/fr.po
index ed415a3390b..c2a47f6ea1a 100644
--- a/addons/l10n_in/i18n/fr.po
+++ b/addons/l10n_in/i18n/fr.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-25 15:28+0000\n"
-"PO-Revision-Date: 2010-12-19 09:47+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-28 15:38+0000\n"
+"Last-Translator: Aline (OpenERP) <Unknown>\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-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_in
@@ -36,7 +36,7 @@ msgstr "Erreur ! Vous ne pouvez pas créer de modèle de compte récursif."
 #. module: l10n_chart_in
 #: model:account.journal,name:l10n_chart_in.opening_journal
 msgid "Opening Journal"
-msgstr ""
+msgstr "Journal d'ouverture"
 
 #. module: l10n_chart_in
 #: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
diff --git a/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf b/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf
index 8e56cbbd703..8e56cbbd703 100755..100644
--- a/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf
+++ b/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index 95b7b941b6e..95b7b941b6e 100755..100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
diff --git a/addons/l10n_ma/i18n/es.po b/addons/l10n_ma/i18n/es.po
new file mode 100644
index 00000000000..f287b15ab65
--- /dev/null
+++ b/addons/l10n_ma/i18n/es.po
@@ -0,0 +1,159 @@
+# Spanish 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: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-28 09:09+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-29 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_ma
+#: model:ir.module.module,description:l10n_ma.module_meta_information
+msgid ""
+"Ce  Module charge le modèle du plan de comptes standard Marocain et permet "
+"de générer les états comptables aux normes marocaines (Bilan, CPC (comptes "
+"de produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
+"d'expertise comptable Seddik au cours du troisième trimestre 2010"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_imm
+msgid "Immobilisations"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_ach
+msgid "Charges Achats"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_tpl
+msgid "Titres de placement"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_vue
+msgid "Vue"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_dct
+msgid "Dettes à court terme"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_stk
+msgid "Stocks"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.line,code:0
+msgid "Variable Name"
+msgstr "Nombre variable"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,definition:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_dlt
+msgid "Dettes à long terme"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.line,name:0
+#: field:l10n.ma.report,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: l10n_ma
+#: field:l10n.ma.report,line_ids:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_tax
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.report:0
+msgid "The code report must be unique !"
+msgstr ""
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_line
+msgid "Report Lines for l10n_ma"
+msgstr ""
+
+#. module: l10n_ma
+#: model:ir.module.module,shortdesc:l10n_ma.module_meta_information
+msgid "Maroc - Plan Comptable Général"
+msgstr ""
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.line:0
+msgid "The variable name must be unique !"
+msgstr "¡El nombre de la variable debe ser único!"
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_report
+msgid "Report for l10n_ma_kzc"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.report,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_per
+msgid "Charges Personnel"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_liq
+msgid "Liquidité"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_pdt
+msgid "Produits"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_reg
+msgid "Régularisation"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_cp
+msgid "Capitaux Propres"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_cre
+msgid "Créances"
+msgstr ""
+
+#. module: l10n_ma
+#: model:account.account.type,name:l10n_ma.cpt_type_aut
+msgid "Charges Autres"
+msgstr ""
diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py
index 57a3bb10df3..57a3bb10df3 100755..100644
--- a/addons/l10n_nl/__init__.py
+++ b/addons/l10n_nl/__init__.py
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 12430e99243..12430e99243 100755..100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
index 07f3306cf94..07f3306cf94 100755..100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/account_chart_netherlands.xml
diff --git a/addons/l10n_nl/l10n_nl_wizard.xml b/addons/l10n_nl/l10n_nl_wizard.xml
index 18f024523d3..18f024523d3 100755..100644
--- a/addons/l10n_nl/l10n_nl_wizard.xml
+++ b/addons/l10n_nl/l10n_nl_wizard.xml
diff --git a/addons/l10n_uk/i18n/es.po b/addons/l10n_uk/i18n/es.po
index fb94ba40c88..19e37401892 100644
--- a/addons/l10n_uk/i18n/es.po
+++ b/addons/l10n_uk/i18n/es.po
@@ -1,38 +1,39 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* l10n_chart_uk_minimal
+# Spanish 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: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-09-29 10:03+0000\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-28 09:06+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
-"Language-Team: \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-10-30 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_receivable
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_receivable
 msgid "Receivable"
-msgstr "A recibir"
+msgstr "A cobrar"
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_asset_view
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.acct_type_asset_view
 msgid "Asset View"
 msgstr ""
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_expense_view
-msgid "Expense View"
-msgstr ""
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_expense
+msgid "Expense"
+msgstr "Gasto"
 
-#. module: l10n_chart_uk_minimal
-#: model:ir.actions.todo,note:l10n_chart_uk_minimal.config_call_account_template_uk_minimal
+#. module: l10n_uk
+#: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_minimal
 msgid ""
 "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 "
@@ -43,99 +44,69 @@ msgid ""
 "Chart of Accounts from a Chart Template."
 msgstr ""
 
-#. module: l10n_chart_uk_minimal
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
-
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_income_view
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.acct_type_income_view
 msgid "Income View"
 msgstr ""
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_income
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_income
 msgid "Income"
 msgstr "Ingreso"
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_tax
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_tax
 msgid "Tax"
 msgstr "Impuesto"
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_cash
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_cash
 msgid "Cash"
-msgstr "Efectivo"
+msgstr "Caja"
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_liability
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_liability
 msgid "Liability"
-msgstr ""
+msgstr "Pasivo"
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_payable
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_payable
 msgid "Payable"
-msgstr "A cancelar"
+msgstr "A pagar"
 
-#. module: l10n_chart_uk_minimal
-#: model:ir.module.module,shortdesc:l10n_chart_uk_minimal.module_meta_information
+#. module: l10n_uk
+#: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
 msgid "United Kingdom - minimal"
-msgstr "Reino Unido - redudido"
+msgstr "Reino Unido - mínimo"
 
-#. module: l10n_chart_uk_minimal
-#: model:ir.module.module,description:l10n_chart_uk_minimal.module_meta_information
+#. module: l10n_uk
+#: model:ir.module.module,description:l10n_uk.module_meta_information
 msgid ""
 "This is the base module to manage the accounting chart for United Kingdom in "
 "OpenERP."
 msgstr ""
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_equity
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_equity
 msgid "Equity"
 msgstr "Patrimonio"
 
-#. module: l10n_chart_uk_minimal
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr "¡Error! No puede crear códigos de impuesto recursivos."
-
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.acct_type_liability_view
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.acct_type_liability_view
 msgid "Liability View"
 msgstr ""
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_expense
-msgid "Expense"
-msgstr "Gasto"
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.acct_type_expense_view
+msgid "Expense View"
+msgstr ""
 
-#. module: l10n_chart_uk_minimal
-#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_view
+#. module: l10n_uk
+#: model:account.account.type,name:l10n_uk.account_type_view
 msgid "View"
 msgstr "Vista"
-
-#~ msgid ""
-#~ "This is the base module to manage the accounting chart for United Kingdom in "
-#~ "Open ERP."
-#~ msgstr ""
-#~ "Esta es la base del módulo para gestionar el Plan Contable para el Reino "
-#~ "Unido en el Open de ERP."
-
-#~ msgid ""
-#~ "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.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generar el plan contable a partir de una plantilla de plan contable. Se le "
-#~ "pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
-#~ "el número de dígitos para generar el código de las cuentas y de la cuenta "
-#~ "bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
-#~ "exacta de la plantilla de plan contable.\n"
-#~ "\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-#~ "Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
-#~ "plan contable a partir de una plantilla de plan contable."
diff --git a/addons/lunch/i18n/de.po b/addons/lunch/i18n/de.po
index 9563229e032..4a79748c1f9 100644
--- a/addons/lunch/i18n/de.po
+++ b/addons/lunch/i18n/de.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-16 09:11+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 15:32+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: lunch
@@ -68,6 +69,15 @@ msgid ""
 "    Apply Different Category for the product.\n"
 "    "
 msgstr ""
+"\n"
+"    Dieses Modul ist ein einfaches Basismodul zur Verwaltung der täglichen "
+"Mitarbeiterverpflegung.\n"
+"\n"
+"    Die Anwendung verfolgt die Bestellungen von Mitarbeitern und prüft Ein- "
+"und Auszahlung aus der\n"
+"    Gemeinschaftskasse. Ausserdem können für den Zweck der Anwendung "
+"Produkte und Kategorien definiert werden.\n"
+"    "
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -84,7 +94,7 @@ msgstr "März"
 #. module: lunch
 #: report:lunch.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Bruttobetrag:"
 
 #. module: lunch
 #: field:report.lunch.amount,day:0
@@ -180,7 +190,7 @@ msgstr "Datum Erstellung"
 #. module: lunch
 #: report:lunch.order:0
 msgid "Name/Date"
-msgstr ""
+msgstr "Name/Datum"
 
 #. module: lunch
 #: field:lunch.order,descript:0
diff --git a/addons/lunch/i18n/fr.po b/addons/lunch/i18n/fr.po
index d9a8b8f9ab0..fd3d9aad856 100644
--- a/addons/lunch/i18n/fr.po
+++ b/addons/lunch/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 02:13+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-28 15:59+0000\n"
+"Last-Translator: Aline (OpenERP) <Unknown>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: lunch
@@ -69,6 +68,13 @@ msgid ""
 "    Apply Different Category for the product.\n"
 "    "
 msgstr ""
+"\n"
+"    Le module de base pour gérer l'organisation des repas\n"
+"\n"
+"    Suivre les commandes de repas, les mouvements d'argent, la caisse, les "
+"produits.\n"
+"    Appliquer différentes catégories de produits.\n"
+"    "
 
 #. module: lunch
 #: view:lunch.cashmove:0
diff --git a/addons/lunch/wizard/lunch_cashbox_clean.py b/addons/lunch/wizard/lunch_cashbox_clean.py
index 9c03173fd0e..e95d05870f9 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean.py
+++ b/addons/lunch/wizard/lunch_cashbox_clean.py
@@ -57,7 +57,7 @@ class lunch_cashbox_clean(osv.osv_memory):
          #       'box': box_id,
          #       'active': True,
          #   })
-         return {}
+         return {'type': 'ir.actions.act_window_close'}
 
 lunch_cashbox_clean()
 
diff --git a/addons/lunch/wizard/lunch_order_confirm.py b/addons/lunch/wizard/lunch_order_confirm.py
index 4a9ba66ce9f..6014f14f510 100644
--- a/addons/lunch/wizard/lunch_order_confirm.py
+++ b/addons/lunch/wizard/lunch_order_confirm.py
@@ -48,7 +48,7 @@ class lunch_order_confirm(osv.osv_memory):
 
         for confirm_obj in self.read(cr, uid, ids):
             order_ref.confirm(cr, uid, data, confirm_obj['confirm_cashbox'], context)
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 lunch_order_confirm()
 
diff --git a/addons/mail_gateway/i18n/de.po b/addons/mail_gateway/i18n/de.po
index 088babdbd14..2e7ecfa997d 100644
--- a/addons/mail_gateway/i18n/de.po
+++ b/addons/mail_gateway/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:20+0000\n"
+"PO-Revision-Date: 2010-12-28 15:33+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mail_gateway
@@ -74,7 +74,7 @@ msgstr "Gruppierung..."
 #. module: mail_gateway
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: mail_gateway
 #: help:mailgate.message,message_id:0
@@ -190,7 +190,7 @@ msgstr "Stufe"
 #: code:addons/mail_gateway/mail_gateway.py:0
 #, python-format
 msgid " added note on "
-msgstr ""
+msgstr " hinzugefügter Hinweis "
 
 #. module: mail_gateway
 #: help:mailgate.message,email_from:0
diff --git a/addons/mail_gateway/i18n/fr.po b/addons/mail_gateway/i18n/fr.po
index 6abfc8a2bb7..c0ab6112e89 100644
--- a/addons/mail_gateway/i18n/fr.po
+++ b/addons/mail_gateway/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 13:54+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 16:00+0000\n"
+"Last-Translator: Aline (OpenERP) <Unknown>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mail_gateway
@@ -189,7 +189,7 @@ msgstr "Étape"
 #: code:addons/mail_gateway/mail_gateway.py:0
 #, python-format
 msgid " added note on "
-msgstr ""
+msgstr " note ajoutée "
 
 #. module: mail_gateway
 #: help:mailgate.message,email_from:0
diff --git a/addons/mail_gateway/i18n/pl.po b/addons/mail_gateway/i18n/pl.po
new file mode 100644
index 00000000000..2d46f0cb03d
--- /dev/null
+++ b/addons/mail_gateway/i18n/pl.po
@@ -0,0 +1,358 @@
+# 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: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-28 09:18+0000\n"
+"Last-Translator: OpenERP Administrators <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-12-29 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID zasobu"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Method is not implemented"
+msgstr "Metoda nie zaimplementowana"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Otwórz załączniki"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Szczegóły wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID odnośnika"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Historia bramki pocztowej"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Note"
+msgstr "Notatka"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+"Błąd ! Tworzenie rekursywnych elementów skojarzonych jest zabronione."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID wiadomości w Emailu"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Odbiorcy wiadomości"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Szczegóły"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Historia bramki pocztowej"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Narzędzia serwera pocztowego"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid " wrote on "
+msgstr " napisano "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Do"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Odnośniki."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Odbiorcy kopii wiadomości"
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "System bramki pocztowej"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nazwa obiektu"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nazwa partnera"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Wątki bramki pocztowej"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Opportunity"
+msgstr "Szansa"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "Emaile"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Stage"
+msgstr "Etap"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid " added note on "
+msgstr " dodano uwagę do "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "Wiadomość od"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Wątek"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Wiadomość Mailgateway"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Użytkownik odpowiedzialny"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Skonwertowano do szansy"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Ukryta kopia"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "Istnieje historia?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Odbiorcy ukrytych kopii wiadomości"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Historia"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Odnośniki"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Wątek bramki pocztowej"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Załączniki"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Otwórz dokument"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Szczegóły wiadomości"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Kopia"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid " on "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Przeszukaj wiadomości"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"Podstawowy system bramki pocztowej do wysyłania odbierania wiadomości\n"
+"    * Historia wiadomości\n"
+"    * Łatwa integracja z dowolnym modułem"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Changed Status to: "
+msgstr "Zmieniono stan na: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Wyświetla tekst"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Właściciel"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Zmieniono etap na: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Wiadomość"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Temat"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID wiadomości w serwerze pocztowym"
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index 879d3d37029..85c92d63989 100755..100644
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -25,7 +25,6 @@ import logging
 import optparse
 import sys
 import xmlrpclib
-import email
 
 class rpc_proxy(object):
     def __init__(self, uid, passwd, host='localhost', port=8069, path='object', dbname='openerp'):
diff --git a/addons/marketing/i18n/de.po b/addons/marketing/i18n/de.po
index bd83810678c..6990dfdeec7 100644
--- a/addons/marketing/i18n/de.po
+++ b/addons/marketing/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 14:55+0000\n"
+"PO-Revision-Date: 2010-12-28 15:38+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
@@ -54,7 +54,7 @@ msgstr "Bild"
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure Your Marketing Application"
-msgstr ""
+msgstr "Konfigurieren Sie die Marketing Anwendung"
 
 #. module: marketing
 #: help:marketing.installer,email_template:0
@@ -86,11 +86,13 @@ msgid ""
 "OpenERP provides Addons to better manage your sales and marketing processes. "
 "Select the ones you would be interested in."
 msgstr ""
+"OpenERP bietet weitere Funktionen für Vertrieb und Marketing. Treffen Sie "
+"eine Auswahl, der für Sie interessanten Erweiterungen."
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Marketing Application Configuration"
-msgstr ""
+msgstr "Konfiguration Marketing Anwendungen"
 
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_installer
@@ -114,7 +116,7 @@ msgstr ""
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
diff --git a/addons/marketing/i18n/es.po b/addons/marketing/i18n/es.po
index 982a4f502e9..b0ba14437fd 100644
--- a/addons/marketing/i18n/es.po
+++ b/addons/marketing/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:44+0000\n"
+"PO-Revision-Date: 2010-12-27 08:26+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index ff3d4cde426..4ee22633769 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:35+0000\n"
+"PO-Revision-Date: 2010-12-28 16:02+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -202,7 +202,7 @@ msgstr "Zurücksetzen"
 #. module: marketing_campaign
 #: help:marketing.campaign,object_id:0
 msgid "Choose the resource on which you want this campaign to be run"
-msgstr ""
+msgstr "Wählen Sie die Ressource auf die sich die Kampagne beziehen soll."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
@@ -620,7 +620,7 @@ msgstr "Kampagnen Analyse"
 #. module: marketing_campaign
 #: sql_constraint:marketing.campaign.transition:0
 msgid "The interval must be positive or zero"
-msgstr ""
+msgstr "Das Intervall sollte positiv oder mindestens Null sein."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
@@ -630,7 +630,7 @@ msgstr "Test in Echtzeit"
 #. module: marketing_campaign
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "Die Vorlagenbezeichnung muss eindeutig sein !"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
@@ -645,7 +645,7 @@ msgstr "Verzeichnis"
 #. module: marketing_campaign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -686,6 +686,35 @@ msgid ""
 "application as it depends on CRM Leads.\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung ermöglicht eine automatisierte Generierung neuer "
+"Vertriebskontakte durch die Anwendung von Kampagnen (Faktisch können "
+"Kampagnen für alle Ressourcen in OpenERP definiert werden, nicht nur für die "
+"CRM Leads Ressource).\n"
+"        Der Kampagnenablauf erfolgt dynamisch und kann dabei verschiedene "
+"Absatzkanäle gleichzeitig zu nutzen. Der Prozess einer Kampagne verläuft wie "
+"folgt:\n"
+"         * Erstellen Sie den Ablauf einer Marketing Kampagne, inklusive der "
+"Medien zu einzelnen Vorgangsschritten, wie z.B. EMailvorlagen, Briefvorlagen "
+"für EMail, Postversand u .a.\n"
+"        * Definieren Sie Auswahllisten für die Filterung der entsprechenden "
+"Kontakte als Zielgruppe der durchzuführenden Kampagne (z.B. die "
+"Kontaktadresse eines bestimmten Landes).\n"
+"        *  Simulieren Sie Ihre Kampagne zu Testzwecken in Echtzeit oder "
+"sofort in einem Zug und nehmen Sie letzte Feineinstellungen vor.\n"
+"        *  Sie können alternativ die tatsächliche Kampagne im manuellen "
+"Betriebsmodus starten, wodurch dann jede einzelne Aktion per Hand bestätigt "
+"werden müsste.\n"
+"      * Für den endgültigen Kampagnenstart öffnen Sie dann Ihre Kampagne und "
+"beobachten die Statistik, vor allem da alle Vorgänge der Kampagne "
+"automatisch erfolgen.\n"
+"     Während die Kampagne läuft, können Sie weiterhin problemlos die "
+"Parameter einer Kampagne justieren, z.B. Filtereinstellungen, Abfolge etc.\n"
+"\n"
+"    Hinweis: Wenn Sie Demo Daten benötigen, könnten Sie hierzu die Anwendung "
+"marketing_campaign_crm_demo installieren, wodurch dann auch die CRM "
+"Anwendung aufgrund seiner Abhängigkeiten installiert wird.\n"
+"    "
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index 6b059d0c1e5..20d862fb6fb 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 08:04+0000\n"
+"PO-Revision-Date: 2010-12-28 08:32+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -204,7 +204,7 @@ msgstr "Reiniciar"
 #. module: marketing_campaign
 #: help:marketing.campaign,object_id:0
 msgid "Choose the resource on which you want this campaign to be run"
-msgstr ""
+msgstr "Escoja el recurso sobre el que desea lanzar esta campaña"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
@@ -689,6 +689,31 @@ msgid ""
 "application as it depends on CRM Leads.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo provee automatización de iniciativas (clientes potenciales) a "
+"través de campañas de marketing (campañas que, en realidad, pueden ser "
+"definidas sobre cualquier recurso, no sólo contactos del CRM).\n"
+"         Las campañas son dinámicas y multicanal. El proceso es el "
+"siguiente:\n"
+"          * Diseñe las campañas de marketing como flujos de trabajo, "
+"incluyendo plantillas de correo electrónico a enviar, informes a imprimir y "
+"enviar por correo, acciones personalizadas, etc.\n"
+"          * Defina los segmentos de entrada que seleccionarán los elementos "
+"a introducir en la campaña (por ejemplo iniciativas de ciertos países, "
+"etc.)\n"
+"          * Lance su campaña en modo simulación para probarla en tiempo real "
+"o acelerada, y ajústela.\n"
+"          * Tambien puede iniciar la campaña real en modo manual, donde cada "
+"acción necesita validación manual.\n"
+"          * Finalmente lance su campaña en vivo, y observe las estadísticas "
+"mientras la campaña hace todo de forma completamente automatizada.\n"
+"          Por supuesto, mientras se ejecuta la campaña puede continuar "
+"ajustando los parámetros, segmentos de entrada, flujo, etc.\n"
+"          \n"
+"          Nota: Si necesita datos de prueba, puede instalar el módulo "
+"marketing_campaign_crm_demo, pero esto también instalará la aplicación de "
+"CRM dado que depende de las iniciativas del CRM.\n"
+"    "
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
@@ -973,7 +998,7 @@ msgstr "Mayo"
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Running"
-msgstr "En ejecucion"
+msgstr "En progreso"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
@@ -989,7 +1014,7 @@ msgstr "Campaña de marketing"
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_done:0
 msgid "End Date"
-msgstr "Fecha fin"
+msgstr "Fecha final"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
diff --git a/addons/marketing_campaign/i18n/fr.po b/addons/marketing_campaign/i18n/fr.po
index d7f178c54d1..3fde5495ece 100644
--- a/addons/marketing_campaign/i18n/fr.po
+++ b/addons/marketing_campaign/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 13:32+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-28 16:11+0000\n"
+"Last-Translator: Aline (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-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -206,7 +205,7 @@ msgstr "Réinitialiser"
 #. module: marketing_campaign
 #: help:marketing.campaign,object_id:0
 msgid "Choose the resource on which you want this campaign to be run"
-msgstr ""
+msgstr "Choisir la ressource sur laquelle lancer cette campagne"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
@@ -690,6 +689,29 @@ msgid ""
 "application as it depends on CRM Leads.\n"
 "    "
 msgstr ""
+"\n"
+"Ce module automatise les campagnes marketing (campagnes qui peuvent être "
+"définies pour toute ressource, pas seulement pour la CRM).\n"
+"         Les campagnes sont dynamiques et multi-canaux. Le processus est le "
+"suivant :\n"
+"          * Conception des campagnes de marketing comme des activités "
+"suivies, avec des modèles de courriel à envoyer, des rapports à imprimer et "
+"à envoyer par courriels, des actions adaptées, etc.\n"
+"          * Définition des segments pour choisir les éléments à mettre dans "
+"la campagne (ex : opportunités venant de certains pays, etc.)\n"
+"          * Lancer la campagne en mode simulation afin de la tester en "
+"accéléré ou en temps réel afin de l'optimiser\n"
+"          * La campagne peut être aussi lancée en mode manuel afin de "
+"valider chaque action\n"
+"          * Enfin, lancer la campagne et observer les statistiques produites "
+"automatiquement. \n"
+"          Pendant la campagne, vous pouvez bien-sûr continuer à optimiser "
+"son paramétrage, ses segments, le flux, etc.\n"
+"          \n"
+"          Note: Si vous en avez besoin, vous pouvez installer les données de "
+"démonstration grâce au module marketing_campaign_crm_demo, cependant, ce "
+"module installera également la CRM car il en dépend.\n"
+"    "
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index e5dbcaba89e..bae8ef5b604 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:49+0000\n"
+"PO-Revision-Date: 2010-12-28 16:06+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
@@ -379,6 +379,19 @@ msgid ""
 "invoice and send propositions for membership renewal.\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung ermöglicht die Durchführung sämtlicher Aktivitäten für eine "
+"Mitgliederverwaltung.\n"
+"Dabei werden verschiedene Mitgliedsgruppen getrennt:\n"
+"* Freiweilliges Mitglied\n"
+"* Verbundmitglied (z.B. eine Gruppe schreibt sich ein)\n"
+"* Zahlende Mitglieder,\n"
+"* Spezielle Anbieter mit besonderen Preisen\n"
+"\n"
+"Die Anwendung ist integriert mit Vertrieb und den Finanzen und ermöglicht "
+"eine automatische\n"
+"Rechnungserstellung sowie auch den Versand spezieller Aktionsangebote.\n"
+"    "
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
@@ -512,7 +525,7 @@ msgstr "Mitglied"
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: membership
 #: view:product.product:0
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 75b2379d414..9c7a66d3057 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -37,11 +37,9 @@
         <menuitem id="menus_dash_mrp" name="Dashboard"
             parent="next_id_77" sequence="0"/>
         <menuitem
-            action="open_board_manufacturing"
-            icon="terp-graph"
-            id="menu_board_manufacturing"
-            parent="menus_dash_mrp"
-            sequence="1" groups="mrp.group_mrp_manager,mrp.group_mrp_user"/>
+            action="open_board_manufacturing" icon="terp-graph"
+            id="menu_board_manufacturing" parent="menus_dash_mrp"
+            sequence="1"/>
 
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="8"
             action="open_board_manufacturing"/>
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index dcaad83b930..1472f18b6e4 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:28+0000\n"
+"PO-Revision-Date: 2010-12-28 17:28+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -105,7 +105,7 @@ msgstr "Fertigungsablauf"
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Produkt Fertigungsstelle"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -128,6 +128,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
+"Anzahl Wiederholungen, die an dieser Fertigungsstelle für einzelne "
+"Fertigungsvorgänge des Fertigungsablaufs erforderlich sind."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -234,6 +236,8 @@ msgid ""
 "Define specific property groups that can be assigned to the properties of "
 "your bills of materials."
 msgstr ""
+"Definition spezifischer Gruppen für Fertigungsmerkmale, die zu den "
+"Eigenschaften einer Stückliste zuordenbar sind."
 
 #. module: mrp
 #: help:mrp.workcenter,product_id:0
@@ -241,6 +245,8 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Tragen Sie ein Produkt ein, für den Zweck der einfachen Rückverfolgung von "
+"Fertigungskosten über Analytische Konten."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -332,6 +338,7 @@ msgstr "August"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
@@ -524,7 +531,7 @@ msgstr ""
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -617,7 +624,7 @@ msgstr "Vorbereitung"
 msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
-msgstr ""
+msgstr "Durch Deaktivierung können Sie den Arbeitsvorgang ausblenden."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
@@ -717,7 +724,7 @@ msgstr "Typ"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Total Cost of "
-msgstr ""
+msgstr "Gesamtkosten von "
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
@@ -746,6 +753,13 @@ msgid ""
 "properties and OpenERP will select automatically the BoM to use according "
 "the the needs."
 msgstr ""
+"Die Eigenschaften in OpenERP werden genutzt, um die richtige Stückliste für "
+"die Produktherstellung auszuwählen, vor allem wenn es verschiedene Verfahren "
+"für die Fertigung eines Produkts gibt. Sie können durchaus mehrere "
+"Eigenschaften zu einer Stückliste zuordnen. Wenn ein Verkaufsauftrag "
+"erstellt wird, kann durch den Vertrieb Bezug auf die definierten "
+"Eigenschaften genommen werden, damit OpenERP dann automatisch die richtige "
+"Stückliste für die Fertigung vorschlagen kann."
 
 #. module: mrp
 #: report:bom.structure:0
@@ -771,6 +785,7 @@ msgid ""
 "Add more functionalities to the core Manufacturing Application with the "
 "following addons."
 msgstr ""
+"Erweitern Sie die Anwendung für die Fertigung durch weitere Funktionen."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -838,6 +853,10 @@ msgid ""
 "master bills of materials. Use this menu to search in which BoM is used a "
 "specific component."
 msgstr ""
+"Bauteilestücklisten repräsentieren die Stücklisten von Baugruppen als "
+"Bestandteile von Endprodukten. Verwenden Sie diese Stücklisten zur Suche "
+"nach spezifischen Baugruppen als Bestandteil in verschiedenen "
+"Produktstücklisten."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
@@ -850,6 +869,8 @@ msgid ""
 "Time in hours for this work center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Zeit in Stunden für die Durchführung des Fertigungsvorgangs für den "
+"speziellen Fertigungsablauf."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -925,7 +946,7 @@ msgstr "Pinnwand"
 #. module: mrp
 #: view:board.board:0
 msgid "Work Center Future Load"
-msgstr ""
+msgstr "Auslastungsvorschau Fertigungsstelle"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -1083,7 +1104,7 @@ msgstr "Bezeichnung"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "MRP Application Configuration"
-msgstr ""
+msgstr "Konfiguration Fertigungsanwendung"
 
 #. module: mrp
 #: help:mrp.installer,mrp_jit:0
@@ -1160,6 +1181,49 @@ msgid ""
 "    * List of procurement in exception\n"
 "    "
 msgstr ""
+"\n"
+"    Diese OpenERP Anwendung steuert Fertigungsaufträge.\n"
+"\n"
+"    Folgende Funktionalitäten werden angeboten:\n"
+"    * Disposition vom Lager / Disposition vom Auftrag\n"
+"    * Multidimensionale Stücklisten ohne Begrenzung der Dimensionen\n"
+"    * Multidimensionaler Fertigungsablauf ohne Begrenzung der Dimensionen\n"
+"    * Integration von Fertigungsabläufen und Fertigungsstellen mit "
+"Analytische Konten (Kostenstellen)\n"
+"    * Regelmässige Fertigungsterminplanung / Just In Time Fertigung\n"
+"    * Multiple Point-of-Sales, Multiple Läger\n"
+"    * Verschiedene Dispositionsverfahren für die Materialbeschaffung\n"
+"    * Kostenermittlung durch Durchschnittspreise oder Standardpreise\n"
+"    * Einfache Analyse von Engpassfaktoren bei Kapazität oder "
+"Materialverfügbarkeit\n"
+"    * Sehr flexible Anpassung\n"
+"    * Möglichkeit der multidimensionalen Navigation in mehrstufigen "
+"Stücklisten in einer Ansicht\n"
+"\n"
+"   durch die Anzeige von untergeordneten Bauteile- oder Phantomstücklisten.\n"
+"\n"
+"    Die Anwendung unterstützt eine vollständige Integration und Planung von "
+"Beständen der Lagerprodukte, \n"
+"    Verbrauchsprodukte oder Dienstleistungen. Dienstleistungen sind "
+"vollständig integriert in andere Anwendungen. \n"
+"    So können Sie zum Beispiel Dienstleistungen in Stücklisten der Fertigung "
+"integrieren, wodurch dann durch \n"
+"    einen Fertigungsauftrag entweder bei einem externen Dienstleister eine "
+"Leistung beauftragt wird oder eine Aufgabe \n"
+"    für das eigene Projektauftragsmanagement entsteht.\n"
+"\n"
+"    Folgende Auswertungen werden angeboten:\n"
+"    * Produktstruktur und Produktbestandteile einer Stückliste\n"
+"    * Auslastungsvorschau für Fertigungsstellen\n"
+"    * Ausgabe eines Fertigungsauftrags\n"
+"    * Vorschau von Lagerbeständen\n"
+"\n"
+"    Es existiert auch eine Pinnwand für die Fertigung:\n"
+"    * Arbeitsliste anstehender Fertigungsaufträge\n"
+"    * Arbeitsliste für den Versand / Auslieferung\n"
+"    * Grafische Übersicht der Auslastung\n"
+"    * Fehlerliste der Materialdisposition\n"
+"    "
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1176,6 +1240,14 @@ msgid ""
 "materials have been defined, OpenERP becomes capable of automatically "
 "deciding on the manufacturing route depending on the needs of the company."
 msgstr ""
+"Fertigungsaufträge beschreiben die einzelnen Vorgänge sowie die "
+"erforderlichen Materialien jeder einzelnen Stufe der\r\n"
+"Fertigungsabfolge. Stücklisten werden für die Ermittlung aller "
+"erforderlichen Materialien sowie der erforderlichen Fertigungsvorgänge "
+"eingesetzt. Sobald eine Stückliste definiert wurde, kann OpenERP bereits "
+"automatisch Arbeitsaufträge und damit die Fertigungskapazität sowie den "
+"Materialbedarf der Fertigung errechnen und sämtliche Auftragspositionen bis "
+"hin zur Auslieferung planen."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
@@ -1335,7 +1407,7 @@ msgstr "Revisionen"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure Your Manufacturing Resource Planning Application"
-msgstr ""
+msgstr "Konfigurieren Sie Ihre Fertigungsanwendung"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action
@@ -1346,6 +1418,12 @@ msgid ""
 "raw materials (stock decrease) and the production of the finished products "
 "(stock increase) when the order is processed."
 msgstr ""
+"Fertigungsaufträge werden in OpenERP normalerweise automatisch auf Basis von "
+"Stücklisten und Beschaffungsregeln vorgeschlagen. OpenERP steuert dabei dann "
+"automatisch den Verbrauch von Lagerprodukten (Bestandsminderung) sowie die "
+"\r\n"
+"Fertigstellung von Endprodukten (Bestandserhöhung) im Rahmen der "
+"Auftragsdurchführung."
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1445,6 +1523,9 @@ msgid ""
 "of one or several people and/or machines that can be considered as a unit "
 "for capacity and planning forecasting."
 msgstr ""
+"Fertigungsstellen ermöglichen die organisatorische Zusammenfassung von "
+"Mitarbeitern oder Maschinen als zentrale Ressource für die Planung der "
+"Kapazität und zur Überwachung der Auslastung."
 
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
@@ -1522,6 +1603,9 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"Alle Produktmengen müssen grösser als '0' sein !\n"
+"Sie sollten das mrp_subproduct Modul installieren, wenn Sie Subprodukte über "
+"eine Stückliste definieren wollen."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1558,7 +1642,7 @@ msgstr "Verkaufsauftrag"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Component Cost of "
-msgstr ""
+msgstr "Bauteilekosten von "
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1603,7 +1687,7 @@ msgstr "Fertigungsaufträge (Startbereit)"
 #: code:addons/mrp/mrp.py:0
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
-msgstr ""
+msgstr "Fertigungsaufträge im Status %s können nicht gelöscht werden"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1694,7 +1778,7 @@ msgstr "Statistik Fertigungsaufträge"
 #: code:addons/mrp/mrp.py:0
 #, python-format
 msgid "Copy"
-msgstr ""
+msgstr "Duplizieren"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1942,6 +2026,9 @@ msgid ""
 "linked to manufacturing activities, receptions of products and delivery "
 "orders."
 msgstr ""
+"Die Bestandsauswertung nach Wochen ermöglicht die Rückverfolgung von "
+"Beständen aufgrund der Aktivitäten der Fertigung, sowie der Produktzu- und -"
+"abgänge der Lagerwirtschaft."
 
 #. module: mrp
 #: view:mrp.product.produce:0
@@ -1956,14 +2043,14 @@ msgstr "Effizienz Fertigung"
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: mrp
 #: help:mrp.bom,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
-msgstr ""
+msgstr "Durch Deaktivierung können Sie die Stückliste ausblenden."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1982,6 +2069,8 @@ msgid ""
 "This reporting allows you to analyse your manufacturing activities and "
 "performance."
 msgstr ""
+"Diese Auswertung ermöglicht Ihnen eine Analyse der Produktivität Ihrer "
+"Fertigung."
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -2096,7 +2185,7 @@ msgstr "Fertigungsabfolge"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -2224,7 +2313,7 @@ msgstr "Fehler"
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Wähle Anzahl"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2268,7 +2357,7 @@ msgstr "Produktion"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Work Cost of "
-msgstr ""
+msgstr "Fertigungskosten von "
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -2279,6 +2368,12 @@ msgid ""
 "to products' needs. You can either create a bill of materials to define "
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
+"Produktstücklisten ermöglichen Ihnen die Verwaltung aller erforderlichen "
+"Produktbestandteile und Mengen für die Fertigung eines Endprodukts. OpenERP "
+"benutzt außerdem die Produktstücklisten zur Errechnung automatischer "
+"Beschaffungsvorschläge für den Materialbedarf. Sie können entweder jeweils "
+"eine Stückliste für jeden einzelnen Produktionsschritt oder eine Stückliste "
+"für sämtliche Produktionsschritte eines Produktes erstellen."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -2306,7 +2401,7 @@ msgstr "Referenz zu Dokument, welches den Fertigungsauftrag ausgelöst hat."
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -2393,6 +2488,9 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
+"Die Auslastung von Fertigungsstellen zeigt die Kapazitätsauslastung über "
+"einen bestimmten Zeitraum. Die Anzeige erfolgt dabei in Stunden sowie in "
+"Anzahl Zyklen der jeweiligen Fertigungsvorgänge einer Fertigungsstelle."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
@@ -2473,6 +2571,9 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
 msgstr ""
+"Definieren Sie die Anzahl zu produzierender oder einzukaufender Produkte. "
+"Die Auswertung zu den Fertigungskosten bezieht sich dann auf diese "
+"Mengenangaben."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index af46ba9b0c7..4ae19062725 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:16+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 09:05+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -105,7 +104,7 @@ msgstr "Procesos productivos"
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Producto centro de producción"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -128,6 +127,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
+"Número de iteraciones que debe realizar este centro de producción en la "
+"operación indicada de la ruta."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -244,6 +245,8 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Introduzca este producto para realizar fácilmente un seguimiento de sus "
+"costes de producción en la contabilidad analítica."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -520,7 +523,7 @@ msgid ""
 "centers."
 msgstr ""
 "La lista de materiales está vinculada a una ruta, es decir, la sucesión de "
-"centros de trabajo."
+"centros de producción."
 
 #. module: mrp
 #: constraint:product.product:0
@@ -530,7 +533,7 @@ msgstr "Error: Código EAN no válido"
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
-msgstr "Indica coste del centro de trabajo por hora."
+msgstr "Indica el coste del centro de producción por hora."
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -582,7 +585,7 @@ msgstr "Marzo"
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Workcenter per cycle."
-msgstr "Especifique el coste por centro de prodcción"
+msgstr "Indica el coste del centro de producción por ciclo."
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
@@ -780,6 +783,8 @@ msgid ""
 "Add more functionalities to the core Manufacturing Application with the "
 "following addons."
 msgstr ""
+"Añada más funcionalidades en el núcleo de la aplicación de fabricación con "
+"los siguientes módulos."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -833,7 +838,7 @@ msgstr "Urgente"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Workcenter Usage"
-msgstr "Uso centro de trabajo"
+msgstr "Uso centro de producción"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -862,6 +867,8 @@ msgid ""
 "Time in hours for this work center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Tiempo en horas para este centro de producción para realizar la operación de "
+"la ruta indicada."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1093,7 +1100,7 @@ msgstr "Nombre"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "MRP Application Configuration"
-msgstr ""
+msgstr "Configuración aplicación MRP"
 
 #. module: mrp
 #: help:mrp.installer,mrp_jit:0
@@ -1128,7 +1135,7 @@ msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
 "Indica el orden de secuencia cuando se muestra una lista de rutas de centros "
-"de trabajo."
+"de producción."
 
 #. module: mrp
 #: constraint:mrp.production:0
@@ -1173,6 +1180,43 @@ msgid ""
 "    * List of procurement in exception\n"
 "    "
 msgstr ""
+"\n"
+"    Este es el módulo base para gestionar el proceso de fabricación en "
+"OpenERP.\n"
+"\n"
+"    Características:\n"
+"    * Obtener para stock / Obtener bajo pedido (por línea)\n"
+"    * Listas de materiales (LdM) multi-nivel, sin límite\n"
+"    * Rutas multi-nivel, sin límite\n"
+"    * Rutas y centro de producción integrado con contabilidad analítica\n"
+"    * Cálculo de la planificación periódica / Módulo Just In Time\n"
+"    * Multi-TPV, multi-almacén\n"
+"    * Distintas políticas de volver a pedir\n"
+"    * Método de coste por producto: precio estándar, precio promedio\n"
+"    * Fácil análisis de problemas o necesidades\n"
+"    * Muy flexible\n"
+"    * Permite mostrar Listas de Materiales en una estructura completa\n"
+"        que incluye LdMs hijas y fantasmas\n"
+"    Soporta la integración y planificación completa de productos "
+"almacenables,\n"
+"    consumibles o servicios. Los servicios están completamente integrados "
+"con el resto\n"
+"    de la aplicación. Por ejemplo, puede configurar un servicio de sub-"
+"contratación\n"
+"    en una LdM para automáticamente comprar bajo pedido el montaje de su "
+"producción.\n"
+"\n"
+"    Informes que proporciona este módulo:\n"
+"    * Estructura y componentes de la Lista de Material\n"
+"    * Previsión de carga en los centros de producción\n"
+"    * Imprimir una orden de producción\n"
+"    * Previsiones de stock\n"
+"    Tableros que proporciona este módulo:\n"
+"    * Lista de las próximas órdenes de producción\n"
+"    * Lista de envíos (albaranes de salida)\n"
+"    * Gráfico de la carga del centro de producción\n"
+"    * Lista de abastecimientos en excepción\n"
+"    "
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1355,6 +1399,7 @@ msgstr "Revisiones"
 #: view:mrp.installer:0
 msgid "Configure Your Manufacturing Resource Planning Application"
 msgstr ""
+"Configure su aplicación de planificación de recursos de fabricación (MRP)"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action
@@ -1469,9 +1514,9 @@ msgid ""
 "of one or several people and/or machines that can be considered as a unit "
 "for capacity and planning forecasting."
 msgstr ""
-"Los centros de trabajo permiten crear y manejar unidades de fabricación "
+"Los centros de producción permiten crear y manejar unidades de fabricación "
 "compuestas por una o varias personas y/o máquinas que pueden ser "
-"consideradas como una unidad a efectos de capacidad y prevision de "
+"consideradas como una unidad a efectos de capacidad y previsión de "
 "planificación."
 
 #. module: mrp
@@ -1483,7 +1528,7 @@ msgstr "ID activo no se encuentra"
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr "Buscar por centro de trabajo mrp"
+msgstr "Buscar por centro de producción mrp"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1525,7 +1570,7 @@ msgstr "Abastecer productos"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 msgid "Work Center Loads"
-msgstr "Cargas centro de trabajo"
+msgstr "Cargas centro de producción"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1726,7 +1771,7 @@ msgstr "Análisis de producción"
 #: code:addons/mrp/mrp.py:0
 #, python-format
 msgid "Copy"
-msgstr ""
+msgstr "Copiar"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1828,7 +1873,7 @@ msgstr ""
 #: view:mrp.production:0
 #: report:mrp.production.order:0
 msgid "Work Orders"
-msgstr "Órdenes de producción"
+msgstr "Órdenes de trabajo"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
@@ -1903,11 +1948,11 @@ msgid ""
 "operations and to plan future loads on workcenters based on production "
 "plannification."
 msgstr ""
-"La lista de las operaciones (lista de los centros de trabajo) para producir "
-"el producto terminado. La ruta se utiliza principalmente para calcular los "
-"costes del centro de trabajo durante las operaciones y para planificar las "
-"futuras cargas en centros de trabajo basado en planificación de la "
-"producción."
+"La lista de las operaciones (lista de los centros de producción) para "
+"producir el producto terminado. La ruta se utiliza principalmente para "
+"calcular los costes del centro de producción durante las operaciones y para "
+"planificar las futuras cargas en centros de producción basado en "
+"planificación de la producción."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
@@ -2015,7 +2060,7 @@ msgstr "Redondeo del producto"
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr "Orden de entrega"
+msgstr "Orden de trabajo"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -2135,7 +2180,7 @@ msgstr "Proceso productivo padre"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -2280,9 +2325,9 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (workcenters) "
 "will be automatically pre-completed."
 msgstr ""
-"La ruta indica todos los centros de trabajo utilizados, por cuánto tiempo "
+"La ruta indica todos los centros de producción utilizados, por cuánto tiempo "
 "y/o ciclos. Si se indica la ruta, entonces la tercera pestaña de una orden "
-"de producción (Centros de trabajo) será automáticamente pre-completada."
+"de producción (centros de producción) será automáticamente pre-completada."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
@@ -2413,11 +2458,11 @@ msgid ""
 "operations and to plan future loads on workcenters based on production "
 "planning."
 msgstr ""
-"La lista de las operaciones (lista de los centros de trabajo) para producir "
-"el producto terminado. La ruta se utiliza principalmente para calcular los "
-"costes del centro de trabajo durante las operaciones y para planificar las "
-"futuras cargas en los centros de trabajo basado en la planificación de la "
-"producción."
+"La lista de las operaciones (lista de los centros de producción) para "
+"producir el producto terminado. La ruta se utiliza principalmente para "
+"calcular los costes del centro de producción durante las operaciones y para "
+"planificar las futuras cargas en los centros de producción basado en la "
+"planificación de la producción."
 
 #. module: mrp
 #: view:board.board:0
@@ -2436,9 +2481,9 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
-"\"Carga de los centros de trabajo\" muestra un pronóstico de la carga de los "
-"centros de trabajo respecto a un periodo específico. Está expresado en "
-"número de horas y ciclos de máquina relacionados."
+"Las cargas de los centros de producción muestran un pronóstico de la carga "
+"de los centros de producción respecto a un periodo determinado. Está "
+"expresado en número de horas y ciclos de máquina relacionados."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
@@ -2518,6 +2563,8 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
 msgstr ""
+"Indique la cantidad de productos a producir o comprar. El informe de la "
+"estructura de costes se muestra basándose en esta cantidad."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 5a8aca33fe2..577e85c38fd 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-27 12:37+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-28 08:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -917,7 +917,7 @@ msgstr ""
 #: model:process.node,name:mrp.process_node_stockproduct1
 #: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product"
-msgstr "Produkt rejestrowany"
+msgstr "Rejestrowany"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 10594219041..9bbb6a97cee 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -11,10 +11,9 @@
 
 
         <menuitem name="Master Data"
-                  id="menu_mrp_bom"
-                  parent="base.menu_mrp_root"
-                  groups="mrp.group_mrp_manager,mrp.group_mrp_user"
-                  sequence="5" />
+            id="menu_mrp_bom"
+            parent="base.menu_mrp_root"
+            sequence="5" />
 
         <!--
         Property / Property Group
@@ -112,12 +111,10 @@
         <menuitem
             action="mrp_property_action"
             id="menu_mrp_property_action"
-            parent="menu_mrp_property"
-            groups="base.group_extended" />
+            parent="menu_mrp_property"/>
         <menuitem
             action="mrp_property_group_action"
-            id="menu_mrp_property_group_action"
-            parent="menu_mrp_property"/>
+            id="menu_mrp_property_group_action"/>
 
         <!--
         Work Centers
@@ -189,9 +186,9 @@
                    <group col='15' colspan='4'>
                         <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                         <separator orientation="vertical"/>
-	                    <field name="code"/>
-	                    <field name="name"/>
-	                    <field name="resource_type"/>
+                        <field name="code"/>
+                        <field name="name"/>
+                        <field name="resource_type"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
@@ -438,7 +435,6 @@
             action="mrp_bom_form_action"
             id="menu_mrp_bom_form_action"
             parent="menu_mrp_bom"
-            groups="mrp.group_mrp_user,mrp.group_mrp_manager"
             sequence="10"/>
         <menuitem
             action="mrp_bom_form_action2"
@@ -747,7 +743,7 @@
                        <field name="origin"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="10" col="8">
+                    <group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>
@@ -770,7 +766,8 @@
             <field name="context">{'search_default_current':1}</field>
             <field name="help">Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumption of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed.</field>
         </record>
-        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" groups="mrp.group_mrp_user,mrp.group_mrp_manager" sequence="1"/>
+        <menuitem action="mrp_production_action" id="menu_mrp_production_action"
+            parent="menu_mrp_manufacturing" sequence="1"/>
 
         <record id="mrp_production_action_planning" model="ir.actions.act_window">
             <field name="name">Manufacturing Orders</field>
@@ -909,7 +906,7 @@
             view_id="mrp_bom_tree_view"
             res_model="mrp.bom"
             src_model="product.product"
-            groups="base.group_extended"/>
+            groups="mrp.group_mrp_user"/>
 
         <act_window
             domain="[('bom_id','=',False)]"
@@ -917,7 +914,8 @@
             id="act_product_product_2_mrp_bom"
             name="Bill of Materials"
             res_model="mrp.bom"
-            src_model="product.product"/>
+            src_model="product.product"
+            groups="mrp.group_mrp_user"/>
 
         <!-- Menu for Resource for MRP-->
 
@@ -939,12 +937,11 @@
         <!-- Planning -->
 
         <menuitem id="menu_mrp_planning" name="Planning"
-		        parent="base.menu_mrp_root" sequence="2"
-		        groups="base.group_extended"/>
-		<menuitem action="mrp.mrp_production_action_planning"
-		        id="menu_mrp_production_order_action"
-		        parent="menu_mrp_planning" sequence="1"
-		        groups="base.group_extended"/>
+                parent="base.menu_mrp_root" sequence="2"
+                groups="base.group_extended"/>
+        <menuitem action="mrp.mrp_production_action_planning"
+                id="menu_mrp_production_order_action"
+                parent="menu_mrp_planning" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 496462b390c..21897629117 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,8 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1
+"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,1,1,0
+"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,0,0,0
 "access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
 "access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
 "access_mrp_production_salesman","mrp.production salesman","model_mrp_production","base.group_sale_salesman",1,1,1,0
@@ -12,7 +12,7 @@
 "access_mrp_property","mrp.property","procurement.model_mrp_property","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
 "access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
-"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1
@@ -23,7 +23,7 @@
 "access_stock_warehouse","stock.warehouse mrp_worker","stock.model_stock_warehouse","mrp.group_mrp_user",1,0,0,0
 "access_account_analytic_journal_mrp_worker","account.analytic.journal mrp_worker","account.model_account_analytic_journal","mrp.group_mrp_user",1,0,0,0
 "access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0
-"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,1,1,1
+"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,0,0,0
 "access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
 "access_hr_timesheet_group_mrp_worker","resource.calendar mrp_manager","resource.model_resource_calendar","mrp.group_mrp_manager",1,1,1,1
 "access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
@@ -32,23 +32,23 @@
 "access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_manager",1,1,1,1
 "access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,1,1,1
 "access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,1,1,1
-"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,0,0,0
+"access_product_product_manager","product.product manager","product.model_product_product","mrp.group_mrp_manager",1,0,0,0
 "access_ir_property_manager","ir.property manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
 "access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1
-"access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,0,0,0
+"access_product_product_user","product.product user","product.model_product_product","mrp.group_mrp_user",1,0,0,0
 "access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,0,0,0
-"access_product_uom_user","product.uom user","product.model_product_uom","mrp.group_mrp_user",1,1,1,1
+"access_product_uom_user","product.uom user","product.model_product_uom","mrp.group_mrp_user",1,0,0,0
 "access_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","mrp.group_mrp_user",1,1,1,1
-"access_res_partner_address","res.partner.address","base.model_res_partner_address","mrp.group_mrp_user",1,1,1,1
+"access_res_partner_address","res.partner.address","base.model_res_partner_address","mrp.group_mrp_user",1,0,0,0
 "access_stock_tracking","stock.tracking","stock.model_stock_tracking","mrp.group_mrp_user",1,1,1,0
-"access_res_partner","res.partner","base.model_res_partner","mrp.group_mrp_user",1,1,1,0
+"access_res_partner","res.partner","base.model_res_partner","mrp.group_mrp_user",1,0,0,0
 "access_workcenter_user","mrp.production.workcenter.line.user","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
 "access_resource_calendar_leaves_user","mrp.resource.calendar.leaves.user","resource.model_resource_calendar_leaves","mrp.group_mrp_user",1,1,1,1
 "access_resource_calendar_leaves_manager","mrp.resource.calendar.leaves.manager","resource.model_resource_calendar_leaves","mrp.group_mrp_manager",1,0,0,0
 "access_resource_calendar_attendance_manager","mrp.resource.calendar.attendance.manager","resource.model_resource_calendar_attendance","mrp.group_mrp_manager",1,1,1,1
-"access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,1,1,0
-"access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,1,1,0
-"access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,1,1,0
+"access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,0,0,0
+"access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,0,0,0
+"access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,0,0,0
 "access_account_sequence_fiscalyear_manager","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
 "access_product_template_manager","product.template mgr","product.model_product_template","mrp.group_mrp_manager",1,0,0,0
 "access_product_uom_manager","product.uom user","product.model_product_uom","mrp.group_mrp_manager",1,0,0,0
@@ -62,7 +62,7 @@
 "access_mrp_production_manager","mrp.production manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
 "access_procurement_manager","procurement.order","model_procurement_order","mrp.group_mrp_manager",1,0,0,0
 "access_workcenter_manager","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
-"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,1
+"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,0
 "access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
 "access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
 "access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
@@ -71,3 +71,24 @@
 "access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
 "access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
 "access_mrp_bom_salesman","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
+"access_mrp_bom_stockuser","mrp.bom","model_mrp_bom","stock.group_stock_user",1,0,0,0
+"access_product_uom_categ_mrp_manager","product.uom.categ mrp_manager","product.model_product_uom_categ","mrp.group_mrp_manager",1,1,1,1
+"access_product_uom_mrp_manager","product.uom mrp_manager","product.model_product_uom","mrp.group_mrp_manager",1,1,1,1
+"access_product_ul_mrp_manager","product.ul mrp_manager","product.model_product_ul","mrp.group_mrp_manager",1,1,1,1
+"access_product_category_mrp_manager","product.category mrp_manager","product.model_product_category","mrp.group_mrp_manager",1,1,1,1
+"access_product_template_mrp_manager","product.template mrp_manager","product.model_product_template","mrp.group_mrp_manager",1,1,1,1
+"access_product_product_mrp_manager","product.product mrp_manager","product.model_product_product","mrp.group_mrp_manager",1,1,1,1
+"access_product_packaging_mrp_manager","product.packaging mrp_manager","product.model_product_packaging","mrp.group_mrp_manager",1,1,1,1
+"access_product_supplierinfo_mrp_manager","product.supplierinfo mrp_manager","product.model_product_supplierinfo","mrp.group_mrp_manager",1,1,1,1
+"access_pricelist_partnerinfo_mrp_manager","pricelist.partnerinfo mrp_manager","product.model_pricelist_partnerinfo","mrp.group_mrp_manager",1,1,1,1
+"access_product_price_type_mrp_manager","product.price.type mrp_manager","product.model_product_price_type","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_type_mrp_manager","product.pricelist.type mrp_manager","product.model_product_pricelist_type","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_mrp_manager","product.pricelist mrp_manager","product.model_product_pricelist","mrp.group_mrp_manager",1,1,1,1
+"access_ir_property_group_product_mrp_manager","ir_property group_product_mrp_manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
+"access_product_group_res_partner_mrp_manager","res_partner group_mrp_manager","base.model_res_partner","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_version_mrp_manager","product.pricelist.version mrp_manager","product.model_product_pricelist_version","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_item_mrp_manager","product.pricelist.item mrp_manager","product.model_product_pricelist_item","mrp.group_mrp_manager",1,1,1,1
+"access_resource_calendar_manufacturinguser","resource.calendar manufacturing.user","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
+"access_account_account_mrp_manager","account.account mrp manager","account.model_account_account","mrp.group_mrp_manager",1,0,0,0
+"access_account_journal_mrp_manager","account.journal mrp manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0
+"access_stock_location_mrp_manager","stock.location product mrp manager","stock.model_stock_location","mrp.group_mrp_manager",1,0,0,0
diff --git a/addons/mrp/wizard/mrp_track_prod.py b/addons/mrp/wizard/mrp_track_prod.py
index 4b883abf98c..9a99cb68c04 100644
--- a/addons/mrp/wizard/mrp_track_prod.py
+++ b/addons/mrp/wizard/mrp_track_prod.py
@@ -121,7 +121,7 @@ class mrp_track_move(osv.osv_memory):
                     new_prodlot = prodlot_obj.create(cr, uid, {'name': 'PRODUCTION:%d:LOT:%d' % (record_id, idx+1), 'product_id': move.product_id.id})
                     update_val['prodlot_id'] = new_prodlot
                     move_obj.write(cr, uid, [current_move], update_val)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 mrp_track_move()
 
diff --git a/addons/mrp_jit/i18n/de.po b/addons/mrp_jit/i18n/de.po
index c76d190c493..f632cc45165 100644
--- a/addons/mrp_jit/i18n/de.po
+++ b/addons/mrp_jit/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 07:17+0000\n"
+"PO-Revision-Date: 2010-12-28 19:09+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
@@ -47,6 +47,31 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
+"\n"
+"    Diese Anwendung ermöglicht Just-in-Time Kalkulation von "
+"Beschaffungsaufträgen.\n"
+"\n"
+"    Durch die Installation dieser Anwendung müssen Sie nicht mehr manuell in "
+"regelmässigen Abständen\n"
+"    den Assistenten \"Starte Beschaffungsvorschlag\" anwenden (außer Sie "
+"möchten trotzdem weiterhin\n"
+"    die Materialdisposition für die Meldebestandregeln von Lagerprodukten "
+"zum Beispiel einmal täglich \n"
+"    manuell starten).\n"
+"    Alle Beschaffungsaufträge werden unmittelbar generiert, welches in "
+"manchen Anwendungen einen geringen\n"
+"    Performanceverlust zur Folge haben dürfte.\n"
+"\n"
+"    Ausserdem könnte durch dieses Modul der durchschnittliche Lagerbestand "
+"per se etwas höher sein, da\n"
+"    zum einen durch die Logik so früh wie möglich Bestände durch das System "
+"reserviert werden und zum anderen \n"
+"    auch die zeitliche Begrenzung für den Beschaffungszeitraum nicht mehr "
+"berücksichtigt wird. In diesem Fall können\n"
+"    Sie desweiteren auch keine Prioritäten für Lieferungen anwenden.\n"
+"    \n"
+"    \n"
+"    "
 
 #~ msgid "The name of the module must be unique !"
 #~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/mrp_jit/i18n/es.po b/addons/mrp_jit/i18n/es.po
index ffbed9c7cf4..83b015c0913 100644
--- a/addons/mrp_jit/i18n/es.po
+++ b/addons/mrp_jit/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-19 08:58+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:09+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
@@ -46,6 +46,27 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo permite el cálculo sobre la marcha (just in time) de las "
+"órdenes de abastecimiento.\n"
+"\n"
+"    Si instala este módulo, no tendrá que ejecutar el planificador de "
+"abastecimientos\n"
+"    nunca más (pero todavía tendrá que ejecutar el planificador de pedidos "
+"por reglas\n"
+"    de stock mínimo, o por ejemplo dejar que se ejecute diariamente.)\n"
+"    Todos las órdenes de abastecimiento se procesarán inmediatamente, lo que "
+"en\n"
+"    algunos casos puede conllevar un pequeño impacto en el rendimiento.\n"
+"\n"
+"    También podría incrementar su stock porque los productos se reservan\n"
+"    tan pronto posible, y el rango de tiempo del planificador no se tiene "
+"más en cuenta.\n"
+"    En ese caso, ya no podrá usar prioridades en las diferentes entregas "
+"(albaranes).\n"
+"    \n"
+"    \n"
+"    "
 
 #~ msgid "The name of the module must be unique !"
 #~ msgstr "¡El nombre del módulo debe ser único!"
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index 9e820e1ca47..6f54e6bc8d1 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:30+0000\n"
+"PO-Revision-Date: 2010-12-28 19:26+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -457,6 +457,35 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Diese Anwendung erweitert die Fertigungsaufträge um Status, Start Datum "
+"und Ende Datum für Fertigungsvorgänge\n"
+"     (im Aktenreiter Arbeitsaufträge)\n"
+"      Status: Entwurf, Bestätigt, Fertig, Abgebrochen\n"
+"      Bei Klick auf Beendigen, Bestätigen oder  Abbrechen wird zunächst auch "
+"der Status geändert.\n"
+"      Erstellte Menüs:\n"
+"      Fertigung/Fertigung/Arbeitsaufträge\n"
+"      Fertigung/Fertigungsterminierung/Arbeitsaufträge\n"
+"\n"
+"      Im Formular eines Fertigungsauftrags wurden beim Aktenreiter "
+"\"Arbeitsaufträge\" folgende Buttons für den\n"
+"      Workflow ergänzt:\n"
+"      * Start (setze Status auf Bestätigen),\n"
+"      * Erledigt (setze Status auf Beenden),\n"
+"      * Setze auf Entwurf (Setze Status auf Entwurf)\n"
+"      * Abbrechen Statusänderung\n"
+"\n"
+"Zum Zeitpunkt, zu dem der Fertigungsauftrag \"Startbereit fü sitr die "
+"Fertigung\", wurden scheinbar alle\n"
+"Vorgänge bestätigt. Wenn der Produktionsauftrag erledigt wurde, mussten alle "
+"Vorgänge erledigt sein.\n"
+"\n"
+"Das Feld \"Zeitverzug\" ist der Verzug (Stop Datum - Ende Datum).\n"
+"Somit können wir den theoretischen Verzug und den tatsächlichen V ertug "
+"geändert.\n"
+"\n"
+"    "
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -646,7 +675,7 @@ msgstr "Barcode Fertigungsstelle"
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -817,12 +846,13 @@ msgstr "Dauer"
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Bestellmengen können nicht negativ oder '0' sein !"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index 577aa83d2c2..fb3f8043f89 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 08:57+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2010-12-28 09:07+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -23,7 +24,7 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Work Orders"
-msgstr "Órdenes de producción"
+msgstr "Órdenes de trabajo"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
@@ -61,7 +62,7 @@ msgstr "Marzo"
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
 msgid "Work Centers"
-msgstr "Centros de trabajo"
+msgstr "Centros de producción"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -134,7 +135,7 @@ msgstr "Centro de producción"
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr "Las órdenes de trabajo son creadas en base a la orden de producción"
+msgstr "Las órdenes de trabajo son creadas en base a la orden de producción."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -152,7 +153,7 @@ msgstr "Cancelada"
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
 msgid "Confirmed Work Orders"
-msgstr "Órdenes de producción confirmadas"
+msgstr "Órdenes de trabajo confirmadas"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
@@ -203,7 +204,7 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
-"Hay una orden de trabajo por centro de trabajo. La información sobre el "
+"Hay una orden de trabajo por centro de producción. La información sobre el "
 "número de ciclos o duración del ciclo."
 
 #. module: mrp_operations
@@ -269,7 +270,7 @@ msgstr "Fecha orden"
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
 msgid "Future Work Orders"
-msgstr "Órdenes de producción futuras"
+msgstr "Órdenes de trabajo futuras"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -466,7 +467,7 @@ msgstr "Hijo se mueve"
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 msgid "Work Orders Planning"
-msgstr "Planeación de Ordenes de Trabajo"
+msgstr "Planificación de órdenes de trabajo"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -483,6 +484,8 @@ msgstr "Noviembre"
 #: help:mrp.production.workcenter.line,delay:0
 msgid "This is lead time between operation start and stop in this workcenter"
 msgstr ""
+"Este es el plazo de ejecución entre las operaciones de inicio y parada en "
+"este centro de producción."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -547,11 +550,16 @@ msgid ""
 "operations will have different impacts on the costs of manufacture and "
 "planning depending on the available workload."
 msgstr ""
+"Para fabricar o ensamblar productos, así como usar materias primas y el "
+"producto terminado, debe gestionar operaciones de producción. Las "
+"operaciones de producción a menudo se llaman órdenes de trabajo. Las "
+"distintas operaciones tienen diferentes efectos sobre los costes de "
+"fabricación y la planificación depende de la carga de trabajo disponible."
 
 #. module: mrp_operations
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Work Center Production start end workflow"
-msgstr ""
+msgstr "Flujo de inicio-final de la producción en los centros de producción"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
@@ -595,6 +603,11 @@ msgid ""
 "latest operation of a manufacturing order, the MO is automatically done and "
 "the related products are produced."
 msgstr ""
+"Las órdenes de trabajo es la lista de operaciones que se realizarán para "
+"cada orden de producción. Una vez que se inicia el primer trabajo de una "
+"orden de producción, esta se marca automáticamente como iniciada. Una vez "
+"que termine la última operación de una orden de producción, esta se realiza "
+"automáticamente y los productos relacionados son producidos."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -609,7 +622,7 @@ msgstr "Información"
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr "Códigos de barra de centros de trabajo"
+msgstr "Códigos de barra de centros de producción"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
@@ -637,13 +650,13 @@ msgstr "Producción"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Search Work Orders"
-msgstr "Buscar Órdenes de Trabajo"
+msgstr "Buscar órdenes de trabajo"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
 #: model:process.node,name:mrp_operations.process_node_workorder0
 msgid "Work Center"
-msgstr "Centro de trabajo"
+msgstr "Centro de producción"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -685,7 +698,7 @@ msgstr ")"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
 msgid "Work Order Analysis"
-msgstr "Análisisde órdenes de trabajo"
+msgstr "Análisis de órdenes de trabajo"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -703,7 +716,7 @@ msgstr "UdM"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr "Horas por centro de trabajo"
+msgstr "Horas por centro de producción"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
@@ -753,6 +766,8 @@ msgid ""
 "When the operation is finished, the operator updates the system by finishing "
 "the work order."
 msgstr ""
+"Cuando se finaliza la operación, el operador actualiza el sistema "
+"finalizando la orden de trabajo."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -773,7 +788,7 @@ msgstr "Estado producción"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
diff --git a/addons/mrp_operations/report/mrp_code_barcode.rml b/addons/mrp_operations/report/mrp_code_barcode.rml
index bcc4fc54870..bcc4fc54870 100755..100644
--- a/addons/mrp_operations/report/mrp_code_barcode.rml
+++ b/addons/mrp_operations/report/mrp_code_barcode.rml
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.rml b/addons/mrp_operations/report/mrp_wc_barcode.rml
index 6d52cbcd070..6d52cbcd070 100755..100644
--- a/addons/mrp_operations/report/mrp_wc_barcode.rml
+++ b/addons/mrp_operations/report/mrp_wc_barcode.rml
diff --git a/addons/mrp_operations/security/ir.model.access.csv b/addons/mrp_operations/security/ir.model.access.csv
index c27d8fd66e5..c27d8fd66e5 100755..100644
--- a/addons/mrp_operations/security/ir.model.access.csv
+++ b/addons/mrp_operations/security/ir.model.access.csv
diff --git a/addons/mrp_repair/i18n/de.po b/addons/mrp_repair/i18n/de.po
index 22840e8dc28..41fb79ab7c4 100644
--- a/addons/mrp_repair/i18n/de.po
+++ b/addons/mrp_repair/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:39+0000\n"
+"PO-Revision-Date: 2010-12-28 19:41+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -161,6 +161,18 @@ msgid ""
 "           * Repair quotation report\n"
 "           * Notes for the technician and for the final customer\n"
 msgstr ""
+"\n"
+"           Der Zweck der Anwendung ist die Abbildung aller Vorgänge zur "
+"Reparatur von Produkten. Folgende Anforderungen werden dabei abgebildet:\n"
+"              * Ersatz/Ausbau von Produkten im Kontext des "
+"Reparaturvorgangs\n"
+"              * Berücksichtigung der Bestandsänderung durch Ersatz und "
+"Ausbau\n"
+"              * Abrechnung von Reparaturen\n"
+"              * Berücksichtigung von Garantiezeiten\n"
+"              * Angebotserstellung für kostenpflichtige Reparaturen\n"
+"              * Benachrichtigungen für den technischen Kundendienst und den "
+"Kunden\n"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index 93fac0ebce3..a3f23a5f143 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-16 17:42+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:05+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -160,6 +160,15 @@ msgid ""
 "           * Repair quotation report\n"
 "           * Notes for the technician and for the final customer\n"
 msgstr ""
+"\n"
+"           El objetivo es tener un módulo completo para gestionar todas las "
+"reparaciones de productos. Este módulo cubre los siguientes asuntos:\n"
+"           * Añadir/quitar productos en la reparación.\n"
+"           * Impacto en stocks.\n"
+"           * Facturación (productos y/o servicios).\n"
+"           * Concepto de garantía.\n"
+"           * Informe de presupuesto de reparación.\n"
+"           * Notas para el técnico y el cliente final.\n"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
@@ -320,6 +329,14 @@ msgid ""
 "                  \n"
 "* The 'Cancelled' state is set automatically when user cancel repair order."
 msgstr ""
+" * El estado 'Borrador' se establece automáticamente cuando crea una orden "
+"de reparación.                         \n"
+"* El estado 'Confirmado' se establece automáticamente cuando se confirma la "
+"orden de reparación.                         \n"
+"* El estado 'Hecho' se establece automáticamente cuando se completa la orden "
+"de reparación.                        \n"
+"* El estado 'Cancelado' se establece automáticamente cuando el usuario "
+"cancela la orden de reparación."
 
 #. module: mrp_repair
 #: report:repair.order:0
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index e7ef69c2dcc..21d4948096e 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -48,7 +48,7 @@ class repair_cancel(osv.osv_memory):
         else:
             raise osv.except_osv(_('Warning!'),_('Repair order is not invoiced.'))
         
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """ Changes the view dynamically
diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_subproduct/i18n/de.po
index f0951d198ca..6c3770c38d4 100644
--- a/addons/mrp_subproduct/i18n/de.po
+++ b/addons/mrp_subproduct/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:31+0000\n"
+"PO-Revision-Date: 2010-12-28 19:45+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
@@ -82,6 +82,15 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die Produktion weiterer Subprodukte über einen "
+"Fertigungsauftrag.\n"
+"Sie können Subprodukte in der Stückliste definieren.\n"
+"Ohne diese Anwendung gilt:\n"
+"    A + B + C -> D\n"
+"Durch diese Anwendung gilt:\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_uom:0
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index 534b367be5b..367c9eab9a8 100644
--- a/addons/mrp_subproduct/i18n/es.po
+++ b/addons/mrp_subproduct/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:56+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 08:01+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
@@ -84,6 +83,15 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo le permite producir varios productos desde una orden de "
+"producción.\n"
+"Puede configurar los sub-productos en la lista de materiales.\n"
+"Sin este módulo:\n"
+"    A + B + C -> D\n"
+"Con este módulo:\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_uom:0
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 2d7c761da90..130411987c1 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -60,7 +60,6 @@ class mrp_bom(osv.osv):
 mrp_bom()
 
 class mrp_production(osv.osv):
-    _name = 'mrp.production'
     _description = 'Production'
     _inherit= 'mrp.production'
 
diff --git a/addons/multi_company/i18n/de.po b/addons/multi_company/i18n/de.po
index a06cdae219f..cf134af07d5 100644
--- a/addons/multi_company/i18n/de.po
+++ b/addons/multi_company/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 09:34+0000\n"
+"PO-Revision-Date: 2010-12-28 19:47+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -107,6 +107,12 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
+"\n"
+"    Das Multicompany Modul ermöglicht die Abbildung von Multicompany "
+"Anwendungsszenarien.\n"
+"    Dieses Modul bietet dabei die Grundlage für erweiterte Multicompany "
+"Anwendungen.\n"
+"    "
 
 #~ msgid "Default Company"
 #~ msgstr "Standard Mandant"
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index 8f6b87afd2d..3a3a9901ac9 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/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: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-16 17:44+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:13+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -106,6 +106,10 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
+"\n"
+"    El módulo de multicompañía permite gestionar un entorno multicompañía.\n"
+"    Este módulo sirve de base a los otros módulos multicompañía.\n"
+"    "
 
 #~ msgid "Default Company"
 #~ msgstr "Compañía por defecto"
diff --git a/addons/outlook/i18n/de.po b/addons/outlook/i18n/de.po
index 0a3209232a0..571700bf7eb 100644
--- a/addons/outlook/i18n/de.po
+++ b/addons/outlook/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 08:17+0000\n"
+"PO-Revision-Date: 2010-12-28 19:54+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
@@ -80,6 +80,18 @@ msgid ""
 "\n"
 "      "
 msgstr ""
+"\n"
+"      Diese Anwendung ermöglicht die Nutzung des Outlook Plugins. \n"
+"\n"
+"      Das Outlook Plugin ermöglicht die Auswahl eines Objektes aus OpenERP "
+"zu dem Sie eine\n"
+"      Email mit oder ohne Dateianhang aus Outlook zuordnen möchten. Sie "
+"können zu diesem Zweck\n"
+"      einem Partner, einer Aufgabe, einem Projekt, einem analytischen Konto "
+"oder jedem andere verfügbaren Objekt\n"
+"      aus OpenERP eine Email mit oder ohne Anhang zuordnen.\n"
+"\n"
+"      "
 
 #. module: outlook
 #: help:outlook.installer,doc_file:0
@@ -112,6 +124,10 @@ msgid ""
 "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
+"Das Plugin ermöglicht die Verlinkung einer EMail aus Outlook mit beliebigen "
+"OpenERP Belegen. Sie können hierzu entweder\r\n"
+"die EMail zu vorhandenen Objekten abspeichern oder wahlweise neue Objekte "
+"durch eine Outlook Email in OpenERP erstellen."
 
 #. module: outlook
 #: view:outlook.installer:0
diff --git a/addons/outlook/i18n/es.po b/addons/outlook/i18n/es.po
index da30de13d4f..e0aa82e3bde 100644
--- a/addons/outlook/i18n/es.po
+++ b/addons/outlook/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 09:31+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 08:17+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
@@ -79,6 +80,18 @@ msgid ""
 "\n"
 "      "
 msgstr ""
+"\n"
+"      Este módulo provee el conector (plug-in) de Outlook. \n"
+"\n"
+"      El conector de Outlook le permite seleccionar un objeto que desearía "
+"adjuntar\n"
+"      a su correo y sus adjuntos desde MS Outlook. Puede seleccionar una "
+"empresa, una tarea,\n"
+"      un proyecto, una cuenta analítica, o cualquier otro objeto, y archivar "
+"el correo seleccionado\n"
+"      en mensajes de correo con adjuntos.\n"
+"\n"
+"      "
 
 #. module: outlook
 #: help:outlook.installer,doc_file:0
diff --git a/addons/outlook/i18n/pl.po b/addons/outlook/i18n/pl.po
new file mode 100644
index 00000000000..57da11f3c85
--- /dev/null
+++ b/addons/outlook/i18n/pl.po
@@ -0,0 +1,144 @@
+# 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: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2010-12-28 09:11+0000\n"
+"Last-Translator: OpenERP Administrators <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-12-29 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Wtyczka Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Podręcznik instalacji"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Konfiguruj"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr "Wtyczka Outlook"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr ""
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Interfejs Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Nazwa pliku"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Wtyczka Outlook "
+
+#. module: outlook
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid ""
+"\n"
+"      This module provide the Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in allows you to select an object that you’d like to add\n"
+"      to your email and its attachments from MS Outlook. You can select a "
+"partner, a task,\n"
+"      a project, an analytical account, or any other object and Archived "
+"selected\n"
+"      mail in mailgate.messages with attachments.\n"
+"\n"
+"      "
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "Plik dokumentacji: jak instalować wtyczkę Outlook"
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
+msgid "Outlook Plug-In Configuration"
+msgstr "Konfiguracja wtyczki Outlook"
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you’d like to add to your email and its "
+"attachments."
+msgstr ""
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Pomiń"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Zamknij"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Kroki instalacji i konfiguracji"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Obraz"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"Plik wtyczki outlooka. Zapisz jako ten plik i instaluj tę wtyczkę w outlooku."
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Postęp konfiguracji"
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index e9fd756ff3d..e9fd756ff3d 100755..100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
index aa3c0dac378..aa3c0dac378 100644..100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
+++ b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
index 0f821974661..0f821974661 100644..100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
+++ b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
diff --git a/addons/pad/i18n/de.po b/addons/pad/i18n/de.po
index 2bebd000e7a..c7041e24341 100644
--- a/addons/pad/i18n/de.po
+++ b/addons/pad/i18n/de.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-16 09:08+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 19:55+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\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-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: pad
@@ -42,7 +43,7 @@ msgstr "Unternehmen"
 #. module: pad
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: pad
 #: model:ir.module.module,description:pad.module_meta_information
diff --git a/addons/pad/web/editors.py b/addons/pad/web/editors.py
index 689ec48ed1a..b954967497c 100644
--- a/addons/pad/web/editors.py
+++ b/addons/pad/web/editors.py
@@ -13,9 +13,8 @@ class SidebarTemplateEditor(openobject.templating.TemplateEditor):
                 '\n',
                 output.index(self.ADD_ATTACHMENT_BUTTON)) + 1
         output = output[:form_opener_insertion] + \
-                 '''<a href="#" id="add-pad" class="button-a"
-                       style="float: right; line-height: 13px; margin-right: 3px;"
-                       >${_("Pad")}</a>\n''' + \
+                 '''<a href="#" id="add-pad" class="button-a
+                 attachment-button">${_(" Add pad")}</a>\n''' + \
                  output[form_opener_insertion:]
         return output
 
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index 89b5a14cbfe..eb7cbcac436 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-14 21:01+0000\n"
+"PO-Revision-Date: 2010-12-28 20:12+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -327,6 +327,8 @@ msgid ""
 "You can not open a Cashbox for \"%s\".\n"
 "Please close its related cash register."
 msgstr ""
+"Sie können keine Barkasse für das Konto \"%s\" eröffnen.\n"
+"Bitte beenden Sie zuerst das zugehörige Kassenkonto."
 
 #. module: point_of_sale
 #: help:pos.order,user_salesman_id:0
@@ -560,7 +562,7 @@ msgstr "Barkassen sind bereits abgeschlossen."
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
@@ -801,6 +803,8 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"Der Betrag des Zahlungsbelegs sollte mit dem Betrag der Position auf dem "
+"Bankauszug übereinstimmen."
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
@@ -1200,6 +1204,17 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Hauptfunktionen der Point-of-Sale Anwendung sind folgende:\n"
+"- Schnellerfassung von Verkäufen\n"
+"- Möglichkeit der Auswahl eines Bezahlungsmodus (Schnellauswahl) oder einer "
+"Aufsplittung in verschiedene Zahlungsarten.\n"
+"- Berechnung des restlichen Wechselgeldes bei Bargeldzahlung.\n"
+"- Automatische Erstellung und Bestätigung eines Lieferauftrags.\n"
+"- Möglichkeit zur automatischen Erstellung einer Rechnung.\n"
+"- Möglichkeit zur Rückgabe vorheriger Verkäufe.\n"
+"\n"
+"    "
 
 #. module: point_of_sale
 #: field:pos.order,price_type:0
@@ -1432,6 +1447,8 @@ msgid ""
 "Person who uses the the cash register. It could be a reliever, a student or "
 "an interim employee."
 msgstr ""
+"Verantwortlicher Mitarbeiter für das Kassenregister. Dieses könnte eine "
+"Aushilfe, Student oder ein befristeter Mitarbeiter sein."
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
@@ -1586,11 +1603,14 @@ msgstr "Ja"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
+"Es ist kein Erlöskonto für das folgende Produkt definiert:: \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "The cash register must be opened to be able to execute a payment."
 msgstr ""
+"Das Kassenkonto muss zuerst geöffnet werden, um  aktuell eine Zahlung "
+"vorzunehmen."
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1628,7 +1648,7 @@ msgstr "Verkäufe nach Benutzer"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Cash Register"
-msgstr ""
+msgstr "Öffne Barkasse"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1690,6 +1710,9 @@ msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"Konnte keine Preisliste passend zu Produkt und Menge finden.\n"
+"\n"
+"Sie können nun entweder das Produkt, die Menge oder die Preisliste ändern."
 
 #. module: point_of_sale
 #: field:pos.order.line,serial_number:0
@@ -1782,7 +1805,7 @@ msgstr "Hinzuf. Rabatt"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
 msgid "Close Cash Register"
-msgstr ""
+msgstr "Beende Kasse"
 
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
@@ -1835,7 +1858,7 @@ msgstr "Verkäufe"
 #. module: point_of_sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: point_of_sale
 #: field:pos.discount,discount:0
@@ -1882,6 +1905,8 @@ msgstr "Kassenausgabe"
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
 msgstr ""
+"Die Journalkurzbezeichnung sollte innerhalb eines Unternehmens eindeutig "
+"sein !"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -1978,7 +2003,7 @@ msgstr "Berechnet"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Must be after setLang()"
-msgstr ""
+msgstr "Sollte nach setLang() folgen"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
@@ -2035,6 +2060,7 @@ msgstr "Bitte Partner für Verkauf definieren"
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
 msgstr ""
+"Es existiert kein Konto für Verbindlichkeiten dieses Journals \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: field:pos.order,user_salesman_id:0
@@ -2119,7 +2145,7 @@ msgstr "Bestelldatum"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_close_statement
 msgid "Close Cash Registers"
-msgstr ""
+msgstr "Beenden Barkasse"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2155,7 +2181,7 @@ msgstr "Zwischensumme w/o Steuer"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Add product"
-msgstr ""
+msgstr "Produkt hinzufügen"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 2ef966b2a43..99318ee448a 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 16:04+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:16+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -29,7 +30,7 @@ msgstr "Ventas por día"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
 msgid "Point of Sale Confirm"
-msgstr "Punto de venta Confirmar"
+msgstr "Punto de venta. Confirmar"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
@@ -50,7 +51,7 @@ msgstr "Nº de producto"
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
 msgid "Point Of Sale"
-msgstr "Terminal punto de venta (TPV)"
+msgstr "Punto de Venta"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -129,7 +130,7 @@ msgstr "Caja cerrada"
 #. module: point_of_sale
 #: report:pos.sales.user.today.current.user:0
 msgid "Today's Sales By Current User"
-msgstr "Ventas de hoy del usuario actual"
+msgstr "Ventas de hoy por usuario actual"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -253,7 +254,7 @@ msgstr "Informe de ventas"
 #: code:addons/point_of_sale/wizard/pos_discount.py:0
 #, python-format
 msgid "No Order Lines"
-msgstr ""
+msgstr "Nº líneas pedido"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -325,6 +326,8 @@ msgid ""
 "You can not open a Cashbox for \"%s\".\n"
 "Please close its related cash register."
 msgstr ""
+"No puede abrir una caja registradora para \"%s\".\n"
+"Cierre el registro de caja relacionado."
 
 #. module: point_of_sale
 #: help:pos.order,user_salesman_id:0
@@ -334,7 +337,7 @@ msgstr "Usuario conectado al sistema"
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "Product for Input"
-msgstr ""
+msgstr "Producto para entrada"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -531,7 +534,7 @@ msgstr "Saldo final"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
 msgid "Products for Output Operations"
-msgstr ""
+msgstr "Producto para operaciones de salida"
 
 #. module: point_of_sale
 #: view:pos.payment.report.date:0
@@ -545,6 +548,8 @@ msgid ""
 "Cannot delete a point of sale which is closed or contains confirmed "
 "cashboxes!"
 msgstr ""
+"¡No se puede eliminar un punto de venta que esté cerrado o contenga cajas "
+"registradoras confirmadas!"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:0
@@ -634,7 +639,7 @@ msgstr "Ref. empresa"
 #: model:ir.model,name:point_of_sale.model_pos_close_statement
 #: view:pos.close.statement:0
 msgid "Close Statements"
-msgstr ""
+msgstr "Cerrar extractos"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -673,6 +678,8 @@ msgstr "Ventas aceptadas"
 msgid ""
 "This field authorize Validation of Cashbox without checking ending details"
 msgstr ""
+"Este campo autoriza la validación de la caja registradora sin comprobar los "
+"detalles finales"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -707,7 +714,7 @@ msgstr "Fecha creación"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
 msgid "Today's Sales"
-msgstr "Vetas de hoy"
+msgstr "Ventas de hoy"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
@@ -764,7 +771,7 @@ msgstr "Nº de ctdad"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_return
 msgid "Point of sale return"
-msgstr ""
+msgstr "Punto de venta. Devolución"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
@@ -783,7 +790,7 @@ msgstr "Fecha pedido"
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "Caja registradora cerrada hoy"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -796,11 +803,13 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
 msgid "Product for expenses"
-msgstr ""
+msgstr "Producto para gastos"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sales_user_today_current_user
@@ -886,7 +895,7 @@ msgstr "ErrorUsuario "
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_entries
 msgid "Pos Box Entries"
-msgstr ""
+msgstr "Entradas caja TPV"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:0
@@ -941,7 +950,7 @@ msgstr "Operaciones de entrada"
 #: model:ir.model,name:point_of_sale.model_report_cash_register
 #: view:report.cash.register:0
 msgid "Point of Sale Cash Register Analysis"
-msgstr ""
+msgstr "Punto de venta. Análisis registro caja"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
@@ -951,7 +960,7 @@ msgstr "Ventas por usuarios"
 #. module: point_of_sale
 #: report:pos.payment.report:0
 msgid "Payment For Sale"
-msgstr ""
+msgstr "Pago por venta"
 
 #. module: point_of_sale
 #: field:pos.order,first_name:0
@@ -1034,7 +1043,7 @@ msgstr "Nombre"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
 msgid "Open Cash Registers"
-msgstr ""
+msgstr "Abrir registros de caja"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1077,7 +1086,7 @@ msgstr "Ventas TPV"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
 msgid "All Closed CashBox"
-msgstr ""
+msgstr "Todas cajas registradoras cerradas"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
@@ -1153,17 +1162,17 @@ msgstr "Productos"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
 msgid "Payment Report For Sale"
-msgstr ""
+msgstr "Informe de pago para venta"
 
 #. module: point_of_sale
 #: field:account.journal,special_journal:0
 msgid "Special Journal"
-msgstr ""
+msgstr "Diario especial"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day
 msgid "All closed cashbox of the day"
-msgstr ""
+msgstr "Todas cajas registradoras cerradas del día"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1195,6 +1204,17 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Características principales:\n"
+" - Rápida codificación de la venta.\n"
+" - Permite seleccionar un modo de pago (la forma más rápida) o dividir el "
+"pago entre varios modos de pago.\n"
+" - Cálculo de la cantidad de dinero a devolver.\n"
+" - Crea y confirma el albarán automáticamente.\n"
+" - Permite al usuario crear factura de forma automática.\n"
+" - Permite la devolución de ventas anteriores.\n"
+"\n"
+"    "
 
 #. module: point_of_sale
 #: field:pos.order,price_type:0
@@ -1285,7 +1305,7 @@ msgstr "Número de copias"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr "Pago punto de venta"
+msgstr "Punto de venta. Pago"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1312,7 +1332,7 @@ msgstr "Active ID no encontrado"
 #. module: point_of_sale
 #: field:account.bank.statement.line,is_acc:0
 msgid "Is accompte"
-msgstr ""
+msgstr "Anticipo"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -1330,7 +1350,7 @@ msgstr "Ventas TPV"
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
-msgstr ""
+msgstr "Nombre extracto"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -1349,23 +1369,23 @@ msgstr "Fecha de inicio"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr ""
+msgstr "Punto de venta. Recibo"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:0
 #, python-format
 msgid "No order lines defined for this sale "
-msgstr ""
+msgstr "Nº de líneas del pedido definido en esta venta "
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
 msgid "Sales by User Daily margin"
-msgstr ""
+msgstr "Ventas por margen diario del usuario"
 
 #. module: point_of_sale
 #: field:pos.order,note_2:0
 msgid "Customer Note"
-msgstr ""
+msgstr "Nota cliente"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
@@ -1376,7 +1396,7 @@ msgstr "No se han añadido líneas en esta venta."
 #. module: point_of_sale
 #: field:report.cash.register,balance_start:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Saldo de apertura"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -1389,13 +1409,13 @@ msgstr "Pagado"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr ""
+msgstr "Todas las líneas de venta"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Presupuesto"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1409,17 +1429,17 @@ msgstr "Total:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
 msgid "Sales by margin"
-msgstr ""
+msgstr "Ventas por margen"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr ""
+msgstr "Configuración diario"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Líneas extracto"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
@@ -1427,11 +1447,13 @@ msgid ""
 "Person who uses the the cash register. It could be a reliever, a student or "
 "an interim employee."
 msgstr ""
+"Persona que usa la caja registradora. Podría ser un sustituto, un estudiante "
+"o un empleado provisional."
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"
-msgstr ""
+msgstr "Nº factura"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
@@ -1460,13 +1482,13 @@ msgstr "Factura"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_get_sale
 msgid "Get From Sale"
-msgstr ""
+msgstr "Obtener desde venta"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 #: selection:report.cash.register,state:0
 msgid "Open"
-msgstr ""
+msgstr "Abierto"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
@@ -1477,18 +1499,18 @@ msgstr "Ref. venta"
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date
 msgid "Sales lines Report"
-msgstr ""
+msgstr "Informe líneas ventas"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_entries
 #: view:pos.box.entries:0
 msgid "Box Entries"
-msgstr ""
+msgstr "Asientos caja"
 
 #. module: point_of_sale
 #: selection:pos.order,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "Impuesto excluido"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,net_margin_per_qty:0
@@ -1500,7 +1522,7 @@ msgstr "Margen neto por ctdad"
 #: view:report.sales.by.margin.pos:0
 #: view:report.sales.by.margin.pos.month:0
 msgid "Sales by User Margin"
-msgstr ""
+msgstr "Ventas por margen usuario"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1510,7 +1532,7 @@ msgstr "Impuestos:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
 msgid "Point of Sale Orders Statistics"
-msgstr ""
+msgstr "Punto de venta. Estadísticas pedidos"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_product_product
@@ -1535,7 +1557,7 @@ msgstr "Líneas TPV"
 #. module: point_of_sale
 #: field:product.product,disc_controle:0
 msgid "Discount Control"
-msgstr ""
+msgstr "Control descuento"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
@@ -1551,7 +1573,7 @@ msgstr "Detalles de ventas"
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Fecha final"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
@@ -1562,25 +1584,26 @@ msgstr "Fecha venta"
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_user
 msgid "Sales lines by Users"
-msgstr ""
+msgstr "Líneas de ventas por usuarios"
 
 #. module: point_of_sale
 #: field:res.company,max_diff:0
 msgid "Max Difference for Cashboxes"
-msgstr ""
+msgstr "Máxima diferencia para cajas registradoras"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Yes"
-msgstr ""
+msgstr "Sí"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
+"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
@@ -1602,7 +1625,7 @@ msgstr "Descripción del producto"
 #: field:pos.details,date_start:0
 #: field:pos.sale.user,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Fecha inicial"
 
 #. module: point_of_sale
 #: field:pos.order,amount_total:0
@@ -1623,13 +1646,13 @@ msgstr "Ventas por usuario"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Cash Register"
-msgstr ""
+msgstr "Abrir registro de caja"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "Extracto"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
@@ -1639,7 +1662,7 @@ msgstr "Ref. venta"
 #. module: point_of_sale
 #: field:pos.make.payment,num_sale:0
 msgid "Num.File"
-msgstr ""
+msgstr "Núm. fichero"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
@@ -1647,12 +1670,12 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_payment_report
 #: view:pos.payment.report:0
 msgid "Payment Report"
-msgstr ""
+msgstr "Informe pago"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
 msgid "Return lines"
-msgstr ""
+msgstr "Líneas de devolución"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1685,16 +1708,19 @@ msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"No se ha encontrado una línea de tarifa que concuerde con este producto y "
+"cantidad.\n"
+"Debe cambiar el producto, la cantidad o la tarifa."
 
 #. module: point_of_sale
 #: field:pos.order.line,serial_number:0
 msgid "Serial Number"
-msgstr ""
+msgstr "Número de serie"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Reprint"
-msgstr ""
+msgstr "Reimprimir"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
@@ -1719,7 +1745,7 @@ msgstr "Venta TPV"
 #: code:addons/point_of_sale/wizard/pos_payment.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -1750,24 +1776,24 @@ msgstr "Último albarán de salida"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Línea extracto bancario"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Extracto bancario"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Fecha final"
 
 #. module: point_of_sale
 #: view:report.sales.by.user.pos:0
 #: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS Report"
-msgstr ""
+msgstr "Informe TPV"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
@@ -1793,27 +1819,27 @@ msgstr "Escanear código de barras"
 #: field:pos.box.entries,product_id:0
 #: field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr ""
+msgstr "Operación"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
 
 #. module: point_of_sale
 #: field:pos.order,journal_entry:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Asiento contable"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Factura cancelada"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1825,12 +1851,12 @@ msgstr "Confirmar"
 #. module: point_of_sale
 #: report:pos.payment.report.date:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Líneas ventas"
 
 #. module: point_of_sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: point_of_sale
 #: field:pos.discount,discount:0
@@ -1861,17 +1887,17 @@ msgstr "Informe"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
 msgid "Products for Input Operations"
-msgstr ""
+msgstr "Productos para operaciones de entrada"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user
 msgid "Today's Sales by Current User"
-msgstr ""
+msgstr "Ventas de hoy por usuario actual"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
 msgid "Pos Box Out"
-msgstr ""
+msgstr "TPV. Caja salida"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
@@ -1886,7 +1912,7 @@ msgstr "Configuración"
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Fecha inicial"
 
 #. module: point_of_sale
 #: field:pos.order,date_validation:0
@@ -1903,13 +1929,13 @@ msgstr "¡No tiene suficientes permisos para validar esta venta!"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
 msgid "Invoices"
-msgstr ""
+msgstr "Facturas"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -1920,7 +1946,7 @@ msgstr "Descuento total"
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr ""
+msgstr "Coger dinero"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
@@ -1931,14 +1957,14 @@ msgstr "Detalles de ventas"
 #. module: point_of_sale
 #: field:product.product,am_out:0
 msgid "Control for Output Operations"
-msgstr ""
+msgstr "Control de las operaciones de salida"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:0
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:0
 #, python-format
 msgid "Message"
-msgstr ""
+msgstr "Mensaje"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -1973,14 +1999,14 @@ msgstr "Facturado"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Must be after setLang()"
-msgstr ""
+msgstr "Debe estar después de setLang()"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
@@ -2006,12 +2032,12 @@ msgstr "Línea de venta TPV"
 #. module: point_of_sale
 #: view:pos.open.statement:0
 msgid "Are you sure you want to open the statements ?"
-msgstr ""
+msgstr "¿Seguro que desea abrir los extractos?"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_date
 msgid "POS Payment Report according to date"
-msgstr ""
+msgstr "TPV. Informe de pago según la fecha"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2065,7 +2091,7 @@ msgstr "Ventas por usuario"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -2076,12 +2102,12 @@ msgstr "Imprimir recibo"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Orders lines"
-msgstr ""
+msgstr "TPV Líneas pedido"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:0
@@ -2092,7 +2118,7 @@ msgstr "Error"
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
 msgid "Sales Journal"
-msgstr ""
+msgstr "Diario de ventas"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2110,12 +2136,12 @@ msgstr "Por favor, cree una factura para esta venta."
 #: report:pos.sales.user.today:0
 #: field:report.pos.order,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Fecha pedido"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_close_statement
 msgid "Close Cash Registers"
-msgstr ""
+msgstr "Cerrar registros de caja"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2151,7 +2177,7 @@ msgstr "Subtotal neto"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Add product"
-msgstr ""
+msgstr "Añadir producto"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
@@ -2161,29 +2187,29 @@ msgstr "Informe de pagos"
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "Diarios de caja"
 
 #. module: point_of_sale
 #: view:pos.details:0
 msgid "POS Details :"
-msgstr ""
+msgstr "Detalles TPV:"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "Ventas de hoy por usuario"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 #: view:pos.box.out:0
 msgid "Please fill these fields for entries to the box:"
-msgstr ""
+msgstr "Introduzca estos campos para asientos de la caja:"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:0
 #, python-format
 msgid "please check that account is set to %s"
-msgstr ""
+msgstr "Compruebe que la cuenta esté establecida a %s"
 
 #. module: point_of_sale
 #: field:pos.box.entries,name:0
@@ -2198,17 +2224,17 @@ msgstr "Descripción"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Sales lines"
-msgstr ""
+msgstr "Líneas ventas"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notas internas"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -2218,19 +2244,19 @@ msgstr "Guardar y Cerrar"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Running"
-msgstr ""
+msgstr "En progreso"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_all_closed_cashbox_of_the_day
 msgid "All Cashboxes Of the day"
-msgstr ""
+msgstr "Todas las cajas registradoras del día"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
 #: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
 #: view:report.pos.order:0
 msgid "Point of Sale Analysis"
-msgstr ""
+msgstr "Análisis punto de venta"
 
 #. module: point_of_sale
 #: field:pos.make.payment,partner_id:0
@@ -2238,7 +2264,7 @@ msgstr ""
 #: field:pos.order,partner_id:0
 #: view:report.pos.order:0
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 #. module: point_of_sale
 #: field:pos.make.payment,is_acc:0
@@ -2252,7 +2278,7 @@ msgstr "Adelanto"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2272,18 +2298,18 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,remboursed:0
 msgid "Remboursed"
-msgstr ""
+msgstr "Reembolsado"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open
 msgid "Opened Sales"
-msgstr ""
+msgstr "Ventas abiertas"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: point_of_sale
 #: field:pos.order,statement_ids:0
@@ -2312,7 +2338,7 @@ msgstr "Ventas por margen mensual de usuario"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Buscar pedido de venta"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
@@ -2326,13 +2352,13 @@ msgstr "Asiento contable"
 #: view:pos.order:0
 #, python-format
 msgid "Make Payment"
-msgstr ""
+msgstr "Realizar pago"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
 #: view:pos.sales.user.today:0
 msgid "Sales User Today"
-msgstr ""
+msgstr "Ventas usuario de hoy"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2340,7 +2366,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #~ msgid ","
 #~ msgstr ","
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index c75a1aee4d5..0476fb03b31 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -647,7 +647,6 @@ class pos_order(osv.osv):
                                                                line.qty, partner_id = order.partner_id.id, fposition_id=order.partner_id.property_account_position.id)['value'])
                 inv_line['price_unit'] = line.price_unit
                 inv_line['discount'] = line.discount
-                inv_line['account_id'] = acc
                 inv_line['name'] = inv_name
                 inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\
                     and [(6, 0, inv_line['invoice_line_tax_id'])] or []
diff --git a/addons/process/i18n/de.po b/addons/process/i18n/de.po
index af12b23b608..ebd9fa01f9a 100644
--- a/addons/process/i18n/de.po
+++ b/addons/process/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 08:44+0000\n"
+"PO-Revision-Date: 2010-12-28 22:34+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
@@ -29,7 +29,7 @@ msgstr "Prozessknoten"
 msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
-msgstr ""
+msgstr "Bei Deaktivierung können Sie die Anzeige dieses Prozess verbergen."
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -232,6 +232,17 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Dieses Anwendung zeigt die grundlegenden Prozesse in den ausgewählten "
+"Modulen \n"
+"     sowie die Reihenfolge in der die Prozesse auftreten.\n"
+"\n"
+"     Hinweis: Die Anwendung erfolgt bei Modulen die xml Dateien nach dem "
+"Muster \n"
+"     modulename_process_name beinhalten, z.B. "
+"product/process/product_process_xml\n"
+"\n"
+"    "
 
 #. module: process
 #: field:process.condition,model_states:0
diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index f13f274ac5c..27866b2d41b 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:58+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 08:42+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
@@ -233,6 +232,16 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Este módulo muestra los procesos básicos en los\n"
+"     que intervienen los módulos seleccionados, y\n"
+"     la secuencia en la que ocurren.\n"
+"\n"
+"     Note: Esto es aplicable a los módulos conteniendo "
+"nombredelmodulo_process_xml\n"
+"     por ejemplo product/process/product_process_xml\n"
+"\n"
+"    "
 
 #. module: process
 #: field:process.condition,model_states:0
diff --git a/addons/procurement/company.py b/addons/procurement/company.py
index 09865b3aa14..d544181a6e8 100644
--- a/addons/procurement/company.py
+++ b/addons/procurement/company.py
@@ -27,7 +27,7 @@ class company(osv.osv):
         'schedule_range': fields.float('Scheduler Range Days', required=True,
             help="This is the time frame analysed by the scheduler when "\
             "computing procurements. All procurements that are not between "\
-            "today and today+range are skipped for futur computation."),
+            "today and today+range are skipped for future computation."),
     }
     _defaults = {
         'schedule_range': 80.0,
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 3595b0031ad..40ba10a9664 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:59+0000\n"
+"PO-Revision-Date: 2010-12-28 22:39+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -47,7 +47,7 @@ msgstr "Gruppierung..."
 #. module: procurement
 #: help:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Draft procurement of the product and location of that orderpoint"
-msgstr ""
+msgstr "Beschaffungsentwurf für Produkt oder Lagerort der Bestellung"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -243,12 +243,12 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "Durchzuführende Beschaffungsaufträge"
 
 #. module: procurement
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -458,7 +458,7 @@ msgstr ""
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
-msgstr ""
+msgstr "Bezugnehmende Beschaffungsaufträge"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -491,6 +491,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
+"Durch Deaktivierung können Sie die Ansicht für den Bestellzeitpunkt "
+"ausblenden."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -600,6 +602,7 @@ msgstr "Normal"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
@@ -655,7 +658,7 @@ msgstr "Beschaffung Bezeichnung"
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index 5763582098b..e0605b76e6d 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 14:15+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:19+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\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-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -47,6 +48,8 @@ msgstr "Agrupar por..."
 #: help:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
+"Abastecimiento borrador del producto y ubicación para esta regla de stock "
+"mínimo"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -198,7 +201,7 @@ msgstr "Preparado"
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr "Pedido automático"
+msgstr "Regla de stock mínimo automática"
 
 #. module: procurement
 #: field:mrp.property,composition:0
@@ -238,7 +241,7 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "Órdenes de abastecimiento a procesar"
 
 #. module: procurement
 #: constraint:res.company:0
@@ -446,11 +449,14 @@ msgid ""
 "    This is the module for computing Procurements.\n"
 "    "
 msgstr ""
+"\n"
+"    Este es el módulo para calcular abastecimientos.\n"
+"    "
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
-msgstr ""
+msgstr "Órdenes de abastecimiento relacionadas"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -483,8 +489,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
-"Si el campo activo es falso, le permitirá ocultar el punto de pedido sin "
-"eliminarlo."
+"Si el campo activo se desmarca, permite ocultar la regla de stock mínimo sin "
+"eliminarla."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -554,6 +560,17 @@ msgid ""
 "others require manual intervention (those are identified by a specific error "
 "message)"
 msgstr ""
+"Las órdenes de abastecimiento representan la necesidad de una determinada "
+"cantidad de productos, en un momento dado, en una ubicación determinada. Los "
+"pedidos de venta son una fuente típica de las órdenes de abastecimiento "
+"(pero estos son documentos distintos). Dependiendo de los parámetros de "
+"abastecimiento y la configuración de productos, el motor de abastecimientos "
+"tratará de satisfacer la necesidad de reservar los productos del stock, u "
+"ordenar productos de un proveedor, o crear una orden de producción, etc. Se "
+"produce una excepción de abastecimiento cuando el sistema no puede encontrar "
+"una manera de cumplir un abastecimiento. Algunas excepciones se resolverán "
+"de forma automática, pero otras requieren intervención manual (las que se "
+"identifican con un mensaje de error específico)."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -610,7 +627,7 @@ msgstr "Ord. abastecimiento automática: %s"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr "Orden automática"
+msgstr "Regla de stock mínimo automática"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
@@ -930,7 +947,7 @@ msgstr "Muy urgente"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr "Punto de pedido automático"
+msgstr "Regla de stock mínimo automática"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 34b1577ceba..4886599278b 100644
--- a/addons/procurement/i18n/vi.po
+++ b/addons/procurement/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 08:19+0000\n"
+"PO-Revision-Date: 2010-12-28 08:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -628,7 +628,7 @@ msgstr ""
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "Data Insufficient !"
-msgstr ""
+msgstr "Dữ liệu không đầy đủ !"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property_group
@@ -640,12 +640,12 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Misc"
-msgstr ""
+msgstr "Các thứ khác"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Locations"
-msgstr ""
+msgstr "Các địa điểm"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
@@ -655,7 +655,7 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "General Information"
-msgstr ""
+msgstr "Thông tin chung"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -665,7 +665,7 @@ msgstr ""
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Hoàn tất"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
@@ -680,7 +680,7 @@ msgstr ""
 #: view:procurement.order.compute.all:0
 #: view:procurement.orderpoint.compute:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
@@ -690,12 +690,12 @@ msgstr ""
 #. module: procurement
 #: field:procurement.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Tài liệu gốc"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "Không gấp"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
@@ -705,7 +705,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Current"
-msgstr ""
+msgstr "Hiện tại"
 
 #. module: procurement
 #: view:board.board:0
@@ -715,7 +715,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Details"
-msgstr ""
+msgstr "Các chi tiết"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action5
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c25301b6603..37c300e03ab 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -245,9 +245,10 @@
         <act_window
         context="{'search_default_warehouse_id': active_id}"
         id="act_stock_warehouse_2_stock_warehouse_orderpoint"
-        name="Minimum Stock Rules"
-        res_model="stock.warehouse.orderpoint"
-        src_model="stock.warehouse"/>
+        name="Minimum Stock Rules" 
+        res_model="stock.warehouse.orderpoint" 
+        src_model="stock.warehouse"
+        groups="stock.group_stock_user"/>
 
         <!-- add product_uom to context to be the default value when adding new orderpoints -->
         <act_window
@@ -255,7 +256,8 @@
             id="act_product_product_2_stock_warehouse_orderpoint"
             name="Minimum Stock Rules"
             res_model="stock.warehouse.orderpoint"
-            src_model="product.product"/>
+            src_model="product.product"
+            groups="stock.group_stock_user"/>
 
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id}"
@@ -263,7 +265,8 @@
             id="act_procurement_2_stock_warehouse_orderpoint"
             name="Minimum Stock Rules"
             res_model="stock.warehouse.orderpoint"
-            src_model="procurement.order"/>
+            src_model="procurement.order"
+            groups="stock.group_stock_user"/>
 
         <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
         <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4"/>
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 2e9b44edb63..5bbfa01266b 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -34,8 +34,7 @@
             view_mode="form"
             target="new"
             key2="client_action_multi"
-            id="act_make_procurement"
-            groups="base.group_extended"/>
+            id="act_make_procurement"/>
 
     </data>
 </openerp>
diff --git a/addons/procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
index d94e6753231..8f9c1fc3d53 100644
--- a/addons/procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
@@ -63,7 +63,7 @@ class procurement_compute(osv.osv_memory):
         """
         threaded_calculation = threading.Thread(target=self._procure_calculation_orderpoint, args=(cr, uid, ids, context))
         threaded_calculation.start()
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 procurement_compute()
 
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index 5fae2760edf..293a195b4ed 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -59,8 +59,8 @@ class procurement_compute_all(osv.osv_memory):
         """
         threaded_calculation = threading.Thread(target=self._procure_calculation_all, args=(cr, uid, ids, context))
         threaded_calculation.start()
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 procurement_compute_all()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index 12c5e59ac69..9de1bc6485c 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-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2255,7 +2255,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Product Process"
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index 1f2eb73c7a0..8971d250271 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-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,7 +2252,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Configuration"
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index fcbce14af68..0723f23f6e4 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-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2287,10 +2287,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
-"kategorije i pod kategorije. Ostavite prazno za sve proizvode"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
@@ -2500,6 +2498,13 @@ msgstr ""
 #~ "proizvoda. Druga kašnjenja će biti sabrana za sve nivoe i narudžbenice."
 
 #~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
+#~ "kategorije i pod kategorije. Ostavite prazno za sve proizvode"
+
+#~ msgid ""
 #~ "Delay 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/i18n/ca.po b/addons/product/i18n/ca.po
index 77a533fe6f1..af95bffa1f3 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-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2290,11 +2290,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Indica una categoria de producte si aquesta regla només s'aplica a productes "
-"d'una categoria i als seus descendents. Deixeu-lo buit per a tots els "
-"productes"
 
 #~ msgid "Childs Categories"
 #~ msgstr "Categories filles"
@@ -2603,6 +2600,14 @@ msgstr ""
 #~ "Unitat de mesura per defecte utilitzada en les ordres de compra. Heu "
 #~ "d'estar en la mateixa categoria que la unitat de mesura per defecte."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indica una categoria de producte si aquesta regla només s'aplica a productes "
+#~ "d'una categoria i als seus descendents. Deixeu-lo buit per a tots els "
+#~ "productes"
+
 #~ msgid "KGM"
 #~ msgstr "Kg."
 
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index 61e59066b0c..82f23f6701b 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-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,7 +2252,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Childs Categories"
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 1933f6692ab..3f5821184a7 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:04+0000\n"
+"PO-Revision-Date: 2010-12-28 23:20+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -157,6 +157,8 @@ msgid ""
 "The minimal quantity to trigger this rule, expressed in the supplier UoM if "
 "any or in the default UoM of the product otherrwise."
 msgstr ""
+"Minimalbestand für den Anstoss dieser Regel, ausgedrückt in der Einheit des "
+"Lieferanten oder alternativ in der Standard Mengeneinheit."
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
@@ -496,6 +498,8 @@ msgid ""
 "Choose here the Unit of Measure in which the prices and quantities are "
 "expressed below."
 msgstr ""
+"Wählen Sie die Maßeinheit in der Preise und Stückzahlen unten angezeigt "
+"werden sollen."
 
 #. module: product
 #: field:product.price_list,qty4:0
@@ -518,6 +522,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"Wenn dieses Feld deaktiviert ist, können Produkte ausgeblendet werden."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
@@ -711,6 +716,8 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"Die minimale Anzeige für die Bestellung beim Lieferanten, ausgedrückt in der "
+"Produkt Mengeneinheit des Lieferanten."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -723,6 +730,8 @@ msgid ""
 "This price will be considered as a price for the supplier UoM if any or the "
 "default Unit of Measure of the product otherwise"
 msgstr ""
+"Der Preis wird als Standard Preis für einzelne verschiedene Mengeneinheiten "
+"hinterlegt"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -1228,6 +1237,28 @@ msgid ""
 "    Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"    Dies Anwendung ist das Basis-Modul für die Verwaltung von Produkten und "
+"Preislisten in OpenERP.\n"
+"\n"
+"     Das Produkt Modul unterstützt Varianten, unterschiedliche Preislisten, "
+"Lieferanten\n"
+"     Informationen, verschiedene Dispositionsverfahren vom Lager / vom "
+"Auftrag, verschiedene Mengeneinheiten,\n"
+"     verschiedene Produktverpackungen sowie die Definition von "
+"Produkteigenschaften.\n"
+"\n"
+"     Das Preislistenmanagement unterstützt folgende Anforderungen:\n"
+"     * Mehrstufige Rabatte (nach Produkt, Kategorie, Menge)\n"
+"     * Preisberechnung auf Basis verschiedener Kriterien:\n"
+"         * Andere Preisliste,\n"
+"         * Produktkosten,\n"
+"         * Listenpreis,\n"
+"         * Lieferantenpreis, ...\n"
+"     Preislisten Präferenzen für Produkte und / oder Partnern.\n"
+"\n"
+"     Druck von Artikeldatenblättern oder von Produktetiketten mit Barcode.\n"
+"    "
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -1296,7 +1327,7 @@ msgstr "Partner"
 #. module: product
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Sie können nicht zwei identische Benutzeranmeldungen definieren!"
 
 #. module: product
 #: help:product.template,sale_delay:0
@@ -1332,7 +1363,7 @@ msgstr "Weitere ME"
 #: code:addons/product/product.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Fehler !"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1379,6 +1410,10 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
+"Konfiguration der Reihenfolge, nach der verschiedene Preislistenpositionen "
+"sukzessiv überprüft werden. Die Prüfung erfolgt von der höchsten Priorität "
+"bis zur niedrigsten Priorität  der Reihenfolge und stoppt an der Stelle, wo "
+"der passende Artikel gefunden wird."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1518,6 +1553,8 @@ msgstr ""
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Das ausgewählte Unternehmen gehört nicht zu den zulässigen Unternehmen für "
+"diesen Benutzer"
 
 #. module: product
 #: field:product.uom,rounding:0
@@ -1813,7 +1850,7 @@ msgstr "Bezeichnung für diese Preisart."
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "Mengeneinheit bei Lieferanten"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
@@ -2088,7 +2125,7 @@ msgstr "Gewichte"
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
@@ -2400,11 +2437,11 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Definiere eine Produkt Kategorie, wenn diese Regel nur auf die Produkte "
-"einer Kategorie und seinen zugeordneten Produkten angewendet werden soll. "
-"Lasse den Eintrag leer für alle Produkte."
+"Definieren Sie eine Produktkategorie, nach der diese Regel nur für diese "
+"Kategorie und dessen untergeordnete Element gilt. Bitte lassen Sie dieses "
+"Feld konsequenterweise dann auch für alle anderen Produkte frei."
 
 #~ msgid "Price Min. Margin"
 #~ msgstr "Min. Preisspanne"
@@ -2850,6 +2887,14 @@ msgstr ""
 #~ "Die minimale Bestellmenge bei einem Lieferanten, angezeigt in der Standard "
 #~ "Mengeneinheit für dieses Produkt."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Definiere eine Produkt Kategorie, wenn diese Regel nur auf die Produkte "
+#~ "einer Kategorie und seinen zugeordneten Produkten angewendet werden soll. "
+#~ "Lasse den Eintrag leer für alle Produkte."
+
 #~ msgid "Shortcut for this menu already exists!"
 #~ msgstr "Die Verknüpfung existiert bereits für dieses Menü!"
 
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index fb52fcff1bc..f0d51627537 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2327,11 +2327,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Ρυθμίστε μιά κατηγορία προϊόντων έαν αυτός ο κανόνας χρησιμοποιείται σε "
-"προϊόντα μιάς κατηγορίας και των υποκατηγοριών. Διατηρήστε κενό για όλα τα "
-"προϊόντα."
 
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
@@ -2611,6 +2608,14 @@ msgstr ""
 #~ "Προκαθορισμένη Μονάδα Μέτρησης που χρησιμοποιείται στις εντολές αγοράς. Θα "
 #~ "πρέπει να είναι στην ίδια κατηγορια με την προκαθορισμένη μονάδα μέτρησης."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Ρυθμίστε μιά κατηγορία προϊόντων έαν αυτός ο κανόνας χρησιμοποιείται σε "
+#~ "προϊόντα μιάς κατηγορίας και των υποκατηγοριών. Διατηρήστε κενό για όλα τα "
+#~ "προϊόντα."
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Άκυρο XML για την αρχιτεκτονική όψης!"
 
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 6570f6e0e04..af7cd47d0e8 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 21:09+0000\n"
+"PO-Revision-Date: 2010-12-28 08:52+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -156,6 +156,8 @@ msgid ""
 "The minimal quantity to trigger this rule, expressed in the supplier UoM if "
 "any or in the default UoM of the product otherrwise."
 msgstr ""
+"La cantidad mínima para disparar esta regla, expresada en la UdM del "
+"proveedor si existe o en la UdM por defecto del producto en caso contrario."
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
@@ -490,6 +492,8 @@ msgid ""
 "Choose here the Unit of Measure in which the prices and quantities are "
 "expressed below."
 msgstr ""
+"Seleccione aquí la unidad de medida en que se expresarán los precios y las "
+"cantidades listadas."
 
 #. module: product
 #: field:product.price_list,qty4:0
@@ -707,6 +711,8 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"La cantidad mínima a comprar a este proveedor, expresada en la UdM del "
+"proveedor si existe o en la UdM por defecto del producto en caso contrario."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -719,6 +725,8 @@ msgid ""
 "This price will be considered as a price for the supplier UoM if any or the "
 "default Unit of Measure of the product otherwise"
 msgstr ""
+"Este precio se considerará como el precio para la UdM del proveedor si "
+"existe o en la UdM por defecto del producto en caso contrario."
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -1219,6 +1227,25 @@ msgid ""
 "    Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"    Este es el módulo base para gestionar productos y tarifas en OpenERP.\n"
+"\n"
+"    Los productos soportan variantes, distintos métodos de precios, "
+"información\n"
+"    de proveedor, obtener para stock/pedido, distintas unidades de medida,\n"
+"    empaquetado y propiedades.\n"
+"\n"
+"    Soporte de tarifas:\n"
+"    * Múltiple-nivel de descuento (por producto, categoría, cantidades)\n"
+"    * Cálculo del precio basado en distintos criterios:\n"
+"        * Otra tarifa,\n"
+"        * Precio coste,\n"
+"        * Precio lista,\n"
+"        * Precio proveedor, ...\n"
+"    Preferencias de tarifas por producto y/o empresas.\n"
+"\n"
+"    Imprimir etiquetas de productos con códigos de barras.\n"
+"    "
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -1371,6 +1398,9 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
+"Indica el orden en que los elementos de la tarifa serán comprobados. En la "
+"evaluación se da máxima prioridad a la secuencia más baja y se detiene tan "
+"pronto como se encuentra un elemento coincidente."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1810,7 +1840,7 @@ msgstr "Nombre de este tipo de precio."
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "UdM proveedor"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
@@ -2394,11 +2424,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Indicar una categoría de producto si esta regla sólo se aplica a productos "
-"de una categoría y a sus descendientes. Dejarlo vacío para todos los "
-"productos"
 
 #~ msgid "Childs Categories"
 #~ msgstr "Categorías hijas"
@@ -2707,6 +2734,14 @@ msgstr ""
 #~ "Unidad de medida por defecto utilizada en las órdenes de compra. Debe "
 #~ "estar en la misma categoría que la unidad de medida por defecto."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indicar una categoría de producto si esta regla sólo se aplica a productos "
+#~ "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
+#~ "productos"
+
 #~ msgid "KGM"
 #~ msgstr "Kg."
 
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index 0e5c138444c..e9d18fa397e 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-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2293,11 +2293,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Indicar una categoría de producto si esta regla sólo se aplica a productos "
-"de una categoría y a sus descendientes. Dejarlo vacío para todos los "
-"productos"
 
 #~ msgid ""
 #~ "This is the average time between the confirmation of the customer order and "
@@ -2558,6 +2555,14 @@ msgstr ""
 #~ "los niveles y pedidos de compra."
 
 #~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indicar una categoría de producto si esta regla sólo se aplica a productos "
+#~ "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
+#~ "productos"
+
+#~ msgid ""
 #~ "Delay 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/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index 9cde7b22a85..2dd070082db 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/i18n/es_EC.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2295,11 +2295,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Indicar una categoría de producto si esta regla sólo se aplica a productos "
-"de una categoría y a sus descendientes. Dejarlo vacío para todos los "
-"productos"
 
 #~ msgid ""
 #~ "The cost of the product for accounting stock valuation. It can serves as a "
@@ -2531,6 +2528,14 @@ msgstr ""
 #~ "Unidad de medida por defecto utilizada en las órdenes de compra. Debe "
 #~ "estar en la misma categoría que la unidad de medida por defecto."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indicar una categoría de producto si esta regla sólo se aplica a productos "
+#~ "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
+#~ "productos"
+
 #~ msgid "KGM"
 #~ msgstr "Kg."
 
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index ec14b1e9711..75500c20047 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2283,10 +2283,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Määra toote kategooria, kui see reegel rakendub ainult kategooria toodetele "
-"ja nende alamatele. Hoia tühjana kõigi toodete jaoks."
 
 #~ msgid "Rentable product"
 #~ msgstr "Renditav toode"
@@ -2470,6 +2468,13 @@ msgstr ""
 #~ "poolitada."
 
 #~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Määra toote kategooria, kui see reegel rakendub ainult kategooria toodetele "
+#~ "ja nende alamatele. Hoia tühjana kõigi toodete jaoks."
+
+#~ msgid ""
 #~ "Code of the product for this partner, will be used when printing a request "
 #~ "for quotation. Keep empty to use the internal one."
 #~ msgstr ""
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index 00a1f9d822c..f04089eb1b7 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2255,7 +2255,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Procure Method"
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index ba601e89699..9677e1a0352 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2287,11 +2287,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Aseta tuotekategoria jos sääntöä sovelletaan vain siinä tai sen "
-"alakategorioissa oleviin tuotteisiin. Jätä tyhjäksi jos sovelletaan kaikkiin "
-"tuotteisiin."
 
 #~ msgid "Supplier of Product"
 #~ msgstr "Tuotteen toimittaja"
@@ -2509,6 +2506,14 @@ msgstr ""
 #~ msgstr "Lavoitus"
 
 #~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Aseta tuotekategoria jos sääntöä sovelletaan vain siinä tai sen "
+#~ "alakategorioissa oleviin tuotteisiin. Jätä tyhjäksi jos sovelletaan kaikkiin "
+#~ "tuotteisiin."
+
+#~ msgid ""
 #~ "Default Unit of Measure used for purchase orders. It must in the same "
 #~ "category than the default unit of measure."
 #~ msgstr ""
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 4adfd69f601..4b8a665a16e 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2404,11 +2404,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Indiquer une catégorie de produit si la règle n'est appliquée que sur une "
-"catégorie de produits et ses fils. Laisser vide si elle s'applique à tous "
-"les produits"
 
 #~ msgid "Childs Categories"
 #~ msgstr "Catégorie enfant"
@@ -2656,6 +2653,14 @@ msgstr ""
 #~ "L'unité de mesure par défaut pour les commandes d'achats. Qui doit être dans "
 #~ "la même catégorie que l'unité de mesure par défaut."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indiquer une catégorie de produit si la règle n'est appliquée que sur une "
+#~ "catégorie de produits et ses fils. Laisser vide si elle s'applique à tous "
+#~ "les produits"
+
 #~ msgid "Rentable product"
 #~ msgstr "Peut être loué"
 
diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po
index c2ded4745c3..7cfa744b6a5 100644
--- a/addons/product/i18n/gl.po
+++ b/addons/product/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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2253,5 +2253,5 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index eecf0b3a43e..299c3268d2d 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2290,10 +2290,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Postavite kategoriju proizvoda samo ako se ovo pravilo odnosi na proizvode "
-"kategorije i podkategorije. Ostavite prazno za sve proizvode."
 
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
@@ -2555,5 +2553,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Predefinirana JM za narudžbenice. Mora biti u istoj kategoriji kao i JM."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Postavite kategoriju proizvoda samo ako se ovo pravilo odnosi na proizvode "
+#~ "kategorije i podkategorije. Ostavite prazno za sve proizvode."
+
 #~ msgid "KGM"
 #~ msgstr "KGM"
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 74f51467aac..1bfc1252751 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2255,7 +2255,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Childs Categories"
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 872bd213770..2bcbf54c5de 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,5 +2252,5 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 3dc33158d9c..06d1d37ecae 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2389,11 +2389,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Selezionare una categoria di prodotti se questa regola va applicata ai "
-"prodotti di una categoria e le sue sottocategorie. Lasciare vuoto per tutti "
-"i prodotti."
 
 #~ msgid ""
 #~ "This is the average time between the confirmation of the customer order and "
@@ -2528,6 +2525,14 @@ msgstr ""
 #~ "essere utilizzato come prezzo base per il prezzo del fornitore."
 
 #~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Selezionare una categoria di prodotti se questa regola va applicata ai "
+#~ "prodotti di una categoria e le sue sottocategorie. Lasciare vuoto per tutti "
+#~ "i prodotti."
+
+#~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 #~ "Incoming."
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index 43d428c1a4e..de0a400dc30 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2257,10 +2257,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"이 규칙이 어느 한 카테고리와 그 차일드 카테고리들의 상품에만 적용될 경우, 상품 카테고리를 설정합니다. 모든 상품의 경우는 비워 "
-"두십시오."
 
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
@@ -2525,6 +2523,13 @@ msgstr ""
 #~ "레벨과 구매 주문을 위해 합계됩니다."
 
 #~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "이 규칙이 어느 한 카테고리와 그 차일드 카테고리들의 상품에만 적용될 경우, 상품 카테고리를 설정합니다. 모든 상품의 경우는 비워 "
+#~ "두십시오."
+
+#~ msgid ""
 #~ "Delay 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/i18n/lt.po b/addons/product/i18n/lt.po
index 711b517fe39..a34a7072b1d 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
@@ -2280,10 +2280,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Pasirinkti produkto kategoriją, jeigu taisyklė susijusi su šia kategorija. "
-"Palikti tuščią, jeigu taisyklė naudojama visiems produktams."
 
 #~ msgid "Procure Method"
 #~ msgstr "Gavimo būdas"
@@ -2594,6 +2592,13 @@ msgstr ""
 #~ "Jis turi priklausyti tai pačiai kategorijai kaip ir numatytasis mato vnt."
 
 #~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Pasirinkti produkto kategoriją, jeigu taisyklė susijusi su šia kategorija. "
+#~ "Palikti tuščią, jeigu taisyklė naudojama visiems produktams."
+
+#~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 #~ "Incoming."
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index 7c027cf0886..6d370a9b27f 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-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2253,5 +2253,5 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 99052335a8b..dc48b272e71 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2350,10 +2350,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Уг дүрэм нь сонгосон ангилалын бараануудад үйлчилнэ. Хоосон орхивол бүх "
-"бараанд үйлчилнэ."
 
 #~ msgid "Customer Price"
 #~ msgstr "Зарах үнэ"
@@ -2652,6 +2650,13 @@ msgstr ""
 #~ "Сонгосон хүснэгтэд идэвхитэй үнийн хувилбар алга !\n"
 #~ "' \\n                                'Идэвхитэй хувилбар үүсгэн үү!"
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Уг дүрэм нь сонгосон ангилалын бараануудад үйлчилнэ. Хоосон орхивол бүх "
+#~ "бараанд үйлчилнэ."
+
 #~ msgid "Only one value can be defined for each given usage!"
 #~ msgstr "Бүх хэрэглээнд зөвхөн нэг утга хэрэглэгдэнэ!"
 
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 30955f48632..a1d104bad56 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2255,7 +2255,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index fc0696c580c..939a5d49c9f 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-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2294,11 +2294,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Selecteer een productcategorie als deze regel alleen betrekking heeft op "
-"producten van één categorie en diens subcategorieën. Laat deze leeg voor "
-"alle producten."
 
 #~ msgid "Childs Categories"
 #~ msgstr "Kind Categorieën"
@@ -2682,5 +2679,13 @@ msgstr ""
 #~ "alleen voor het niveau van dit product. Verschillende vertragingen zullen "
 #~ "worden gesommeerd voor alle niveau's en bestelopdrachten."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Selecteer een productcategorie als deze regel alleen betrekking heeft op "
+#~ "producten van één categorie en diens subcategorieën. Laat deze leeg voor "
+#~ "alle producten."
+
 #~ msgid "KGM"
 #~ msgstr "kg"
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index e39ba0b6fb2..bd1cfc0bc9f 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/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-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2253,7 +2253,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index 2ddf87d94c9..fdd61723ff6 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-29 07:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 16:25+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -558,7 +558,7 @@ msgid ""
 "in the product form."
 msgstr ""
 "Jeden lub kilku dostawców może być związane z produktem. Informacje o tym są "
-"formularzu produktu."
+"w formularzu produktu."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -1338,7 +1338,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr "Materiał pomocniczy"
+msgstr "Pomocniczy"
 
 #. module: product
 #: help:product.price.type,currency_id:0
@@ -2306,11 +2306,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Ustaw kategorię produktu, jeśli ta reguła ma dotyczyć produktów tej "
-"kategorii lub kategorii podrzędnych. Zostaw puste, jeśli ma dotyczyć "
-"wszystkich produktów."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
@@ -2541,6 +2538,14 @@ msgstr ""
 #~ msgstr "Nie możesz mieć dwóch cenników nachodzących na siebie !"
 
 #~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Ustaw kategorię produktu, jeśli ta reguła ma dotyczyć produktów tej "
+#~ "kategorii lub kategorii podrzędnych. Zostaw puste, jeśli ma dotyczyć "
+#~ "wszystkich produktów."
+
+#~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 #~ "Incoming."
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 36644321589..4d36296ab2c 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -2116,6 +2116,6 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
-msgid "Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"
+msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
 msgstr ""
 
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index d9072297b98..b517f9f24d5 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2289,10 +2289,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Defina uma categoria de produto se esta regra aplica-se apenas para produtos "
-"de uma categoria e seus dependentes. Manter vazio para todos os produtos."
 
 #~ msgid "Palet"
 #~ msgstr "Palete"
@@ -2642,3 +2640,10 @@ msgstr ""
 #~ msgstr ""
 #~ "Unidade de Medida Padrão utilizada para ordens de compra. Deve estar na "
 #~ "mesma categoria que a unidade de medida padrão."
+
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Defina uma categoria de produto se esta regra aplica-se apenas para produtos "
+#~ "de uma categoria e seus dependentes. Manter vazio para todos os produtos."
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 2127f71ac75..3ee321bb102 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-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2289,10 +2289,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Defina uma categoria de produto, se esta regra apenas se aplica aos produtos "
-"de uma categoria e seus filhos. Mantenha em branco para todos os produtos"
 
 #~ msgid ""
 #~ "This is the average time between the confirmation of the customer order and "
@@ -2530,6 +2528,13 @@ msgstr ""
 #~ "categoria que o padrão da unidade de medida."
 
 #~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Defina uma categoria de produto, se esta regra apenas se aplica aos produtos "
+#~ "de uma categoria e seus filhos. Mantenha em branco para todos os produtos"
+
+#~ msgid ""
 #~ "The coefficient for the formula:\n"
 #~ "1 (base unit) = coef (this unit)"
 #~ msgstr ""
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index edfcee0fbf9..fe602177b62 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2254,7 +2254,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Packagings"
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 28dd270d5aa..5ac8092eb1c 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/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-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2323,7 +2323,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "You can not have 2 pricelist version that overlaps!"
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 1fa79126cb2..ec94060875f 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2291,7 +2291,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index a86d0dd278c..c748d7728a8 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2262,7 +2262,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index 42ab243f3e9..54888661698 100644
--- a/addons/product/i18n/sq.po
+++ b/addons/product/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-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2253,5 +2253,5 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 758a08aac99..923a704da59 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-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2337,10 +2337,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
-"kategorije i pod kategorije. Ostavite prazno za sve proizvode"
 
 #~ msgid ""
 #~ "The cost of the product for accounting stock valuation. It can serves as a "
@@ -2576,6 +2574,13 @@ msgstr ""
 #~ "Podrazumevana jedinica mere koja se koristi za narudžbenice. Mora da bude u "
 #~ "istoj kategoriji kao i podrazumnevana jedinica mere."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
+#~ "kategorije i pod kategorije. Ostavite prazno za sve proizvode"
+
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po
index a795a86ac1b..44c8abb2bdb 100644
--- a/addons/product/i18n/sr@latin.po
+++ b/addons/product/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2337,7 +2337,12 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
-"kategorije i pod kategorije. Ostavite prazno za sve proizvode"
+
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
+#~ "kategorije i pod kategorije. Ostavite prazno za sve proizvode"
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index be55d54fed1..c095f2e1be5 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-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2328,10 +2328,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Bestäm en produktkategori om denna regel endast tillämpas på produkter i en "
-"kategori och barnprodukter. Håll tomt för alla produkter"
 
 #~ msgid "Rentable product"
 #~ msgstr "Hyrbar produkt"
@@ -2571,6 +2569,13 @@ msgstr ""
 #~ "Standardmåttenhet som används för inköpsorder. Den måste finnas i samma "
 #~ "kategori som standardmåttenheten."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Bestäm en produktkategori om denna regel endast tillämpas på produkter i en "
+#~ "kategori och barnprodukter. Håll tomt för alla produkter"
+
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index ee424ec4d05..2b55bb9f2ae 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-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,5 +2252,5 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 530f34daf2a..60a7f9876f1 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-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,7 +2252,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "List Price"
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index 0349f1f0d36..1621ea61b8e 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-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2257,7 +2257,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 3320f79ee2e..920ca2041e7 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-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2290,10 +2290,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Thiết lập một chủng loại sản phẩm nếu quy tắc này chỉ áp dụng cho các sản "
-"phẩm của một chủng loại. Để trống cho tất cả sản phẩm."
 
 #~ msgid "Customer Price"
 #~ msgstr "Giá bán"
@@ -2637,6 +2635,13 @@ msgstr ""
 #~ "category than the default unit of measure."
 #~ msgstr "Đơn vị đo mặc định dùng trong các đơn đặt hàng."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Thiết lập một chủng loại sản phẩm nếu quy tắc này chỉ áp dụng cho các sản "
+#~ "phẩm của một chủng loại. Để trống cho tất cả sản phẩm."
+
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 45bb5ce77a8..158292e2cd2 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-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2262,8 +2262,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
-msgstr "如果这规则只适合这产品类型和它的子项,设置产品类型. ( 留空为适合全部)"
+"and his children. Keep empty for all products"
+msgstr ""
 
 #~ msgid "Childs Categories"
 #~ msgstr "子项分类"
@@ -2572,6 +2572,11 @@ msgstr "如果这规则只适合这产品类型和它的子项,设置产品类�
 #~ "基础单位 = 这单位 * 比率\n"
 #~ "1 / 系数"
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr "如果这规则只适合这产品类型和它的子项,设置产品类型. ( 留空为适合全部)"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "在动作定义中使用了无效的模快名。"
 
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index 167d0f1b72b..79231bd76c0 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-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,7 +2252,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Customer Price"
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 1468cd45200..8991d99d077 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -23,8 +23,6 @@ from osv import fields, osv
 
 from _common import rounding
 import time
-from tools import config
-from tools.misc import ustr
 from tools.translate import _
 import decimal_precision as dp
 
@@ -541,7 +539,7 @@ class product_pricelist_item(osv.osv):
         'price_version_id': fields.many2one('product.pricelist.version', 'Price List Version', required=True, select=True, ondelete='cascade'),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', ondelete='cascade', help="Set a template if this rule only apply to a template of product. Keep empty for all products"),
         'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Set a product if this rule only apply to one product. Keep empty for all products"),
-        'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"),
+        'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"),
 
         'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells more than this quantity."),
         'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
diff --git a/addons/product/product.py b/addons/product/product.py
index 372919f6212..c55105a1b16 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -805,5 +805,4 @@ class res_users(osv.osv):
     _defaults = {
         'groups_id': _get_group,
     }
-
 res_users()
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 563dad08f8d..642ef43caf9 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -196,8 +196,8 @@
             <field name="help">You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on.</field>
         </record>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" groups="group_product_manager,base.group_sale_salesman"/>
-        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager,group_product_manager"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
+        <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
             <field name="name">Products</field>
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 2e4e598fdfe..f80032c6f9a 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -1,18 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_uom_categ_manager","product.uom.categ manager","model_product_uom_categ","product.group_product_manager",1,1,1,1
-"access_product_uom_manager","product.uom manager","model_product_uom","product.group_product_manager",1,1,1,1
-"access_product_ul_manager","product.ul manager","model_product_ul","product.group_product_manager",1,1,1,1
-"access_product_category_manager","product.category manager","model_product_category","product.group_product_manager",1,1,1,1
-"access_product_template_manager","product.template manager","model_product_template","product.group_product_manager",1,1,1,1
-"access_product_product_manager","product.product manager","model_product_product","product.group_product_manager",1,1,1,1
-"access_product_packaging_manager","product.packaging manager","model_product_packaging","product.group_product_manager",1,1,1,1
-"access_product_supplierinfo_manager","product.supplierinfo manager","model_product_supplierinfo","product.group_product_manager",1,1,1,1
-"access_pricelist_partnerinfo_manager","pricelist.partnerinfo manager","model_pricelist_partnerinfo","product.group_product_manager",1,1,1,1
-"access_product_price_type_manager","product.price.type manager","model_product_price_type","product.group_product_manager",1,1,1,1
-"access_product_pricelist_type_manager","product.pricelist.type manager","model_product_pricelist_type","product.group_product_manager",1,1,1,1
-"access_product_pricelist_manager","product.pricelist manager","model_product_pricelist","product.group_product_manager",1,1,1,1
-"access_product_pricelist_version_manager","product.pricelist.version manager","model_product_pricelist_version","product.group_product_manager",1,1,1,1
-"access_product_pricelist_item_manager","product.pricelist.item manager","model_product_pricelist_item","product.group_product_manager",1,1,1,1
 "access_product_uom_categ_user","product.uom.categ.user","model_product_uom_categ","base.group_user",1,0,0,0
 "access_product_uom_user","product.uom.user","model_product_uom","base.group_user",1,0,0,0
 "access_product_ul_user","product.ul.user","model_product_ul","base.group_user",1,0,0,0
@@ -28,6 +14,4 @@
 "access_product_pricelist_item_user","product.pricelist.item.user","model_product_pricelist_item","base.group_user",1,0,0,0
 "access_product_pricelist_type_partner_manager","product.pricelist.type partner manager","model_product_pricelist_type","base.group_partner_manager",1,0,0,0
 "access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
-"access_ir_property_group_product_manager","ir_property group_product_manager","base.model_ir_property","product.group_product_manager",1,1,1,1
-"access_product_group_res_partner","res_partner group_product_manager","base.model_res_partner","product.group_product_manager",1,1,1,1
 "access_product_product_employee","product.product employee","model_product_product","base.group_user",1,0,0,0
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index ce33f8f6eec..fb015d860e1 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -5,9 +5,6 @@
     <record id="group_uos" context="{'noadmin':True}" model="res.groups">
         <field name="name">Useability / Product UoS View</field>
     </record>
-    <record id="group_product_manager" model="res.groups">
-        <field name="name">Product Manager</field>
-    </record>
 
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Sales / Manager</field>
diff --git a/addons/product_expiry/i18n/de.po b/addons/product_expiry/i18n/de.po
index c7d8a7e69f5..d8e9bf02e33 100644
--- a/addons/product_expiry/i18n/de.po
+++ b/addons/product_expiry/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 09:34+0000\n"
+"PO-Revision-Date: 2010-12-28 23:25+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -48,6 +48,8 @@ msgstr "Verfalldauer"
 msgid ""
 "The date on which the lot starts deteriorating without becoming dangerous."
 msgstr ""
+"Der Tag ab dem sich die Qualität verschlechtert, ohne dass die Produkte "
+"bereits unbrauchbar sind."
 
 #. module: product_expiry
 #: field:product.product,use_time:0
@@ -59,11 +61,12 @@ msgstr "Mindesthaltbarkeit"
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
+"Die Kombination von Serinenummer und interner Referenz muss eindeutig sein."
 
 #. module: product_expiry
 #: help:stock.production.lot,removal_date:0
 msgid "The date on which the lot should be removed."
-msgstr ""
+msgstr "Datum ab dem das Fertigungslos nicht mehr verwendet werden sollte."
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
@@ -75,7 +78,7 @@ msgstr "Produkt"
 msgid ""
 "The number of days after which an alert should be notified about the "
 "production lot."
-msgstr ""
+msgstr "Anzahl der Tage nachdem ein Alarm ausgegeben werden soll."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -92,6 +95,8 @@ msgstr "Datum der Vernichtung"
 msgid ""
 "The date on which the lot may become dangerous and should not be consumed."
 msgstr ""
+"Datum nachdem die Losnummer verschieden und nicht mehr benutzt werden "
+"sollten."
 
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
@@ -181,6 +186,8 @@ msgstr ""
 msgid ""
 "The date on which an alert should be notified about the production lot."
 msgstr ""
+"Das Datum, an dem eine Benachrichtung für den Fertgungsauftrag generiert "
+"werden kann"
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
diff --git a/addons/product_manufacturer/i18n/de.po b/addons/product_manufacturer/i18n/de.po
index 233d97fc2f1..d92cb03f5ff 100644
--- a/addons/product_manufacturer/i18n/de.po
+++ b/addons/product_manufacturer/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 12:34+0000\n"
+"PO-Revision-Date: 2010-12-28 23:26+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -63,7 +63,7 @@ msgstr "Wert"
 #. module: product_manufacturer
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: product_manufacturer
 #: view:product.product:0
diff --git a/addons/product_manufacturer/security/ir.model.access.csv b/addons/product_manufacturer/security/ir.model.access.csv
index 6f07fb1dc94..b06d5d3ea96 100644
--- a/addons/product_manufacturer/security/ir.model.access.csv
+++ b/addons/product_manufacturer/security/ir.model.access.csv
@@ -1,3 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",base.group_user,1,0,0,0
-"access_product_manufacturer_attribute_manager","product.manufacturer.attribute","model_product_manufacturer_attribute","product.group_product_manager",1,1,1,1
+"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",base.group_user,1,1,1,1
diff --git a/addons/product_margin/i18n/de.po b/addons/product_margin/i18n/de.po
index 976c9009814..833a349b73b 100644
--- a/addons/product_margin/i18n/de.po
+++ b/addons/product_margin/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 09:32+0000\n"
+"PO-Revision-Date: 2010-12-28 23:40+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
@@ -105,6 +105,14 @@ msgid ""
 "and other interesting indicators based on invoices. The wizard to launch\n"
 "the report has several options to help you get the data you need.\n"
 msgstr ""
+"\n"
+"Ergänzt ein Auswertungsmenü zu Produkten für eine Berechnung der "
+"Umsatzerlöse, des\n"
+"Einkaufsumsatz, der Verkaufsspannen oder anderer betrieblicher Indikatoren "
+"auf Basis der \n"
+"Abrechnung. Der Assistent erstellt dabei eine Auswertung mit zahlreichen "
+"Optionen zur \n"
+"Kalkulation der erforderlichen Daten.\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -255,7 +263,7 @@ msgstr "Allgemeine Information"
 #. module: product_margin
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index a4d55aa1c22..d3c493f7f01 100644
--- a/addons/product_margin/i18n/es.po
+++ b/addons/product_margin/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:50+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 08:51+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
@@ -107,6 +106,11 @@ msgid ""
 "and other interesting indicators based on invoices. The wizard to launch\n"
 "the report has several options to help you get the data you need.\n"
 msgstr ""
+"\n"
+"Añade un menú de informes en los productos, que calcula ventas, compras,\n"
+"márgenes y otros indicadores interesantes en base a las facturas.\n"
+"El asistente ofrece varias opciones para ayudarle a obtener los datos que "
+"necesita.\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index cde2d514560..a6d6eff5238 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -84,7 +84,7 @@
             </field>
         </record>
 
-  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product" groups="base.group_sale_salesman,base.group_sale_manager,product.group_product_manager"/>
+  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product"/>
 
 </data>
 </openerp>
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
index cb9cf4fcf6b..f474a0dd451 100644
--- a/addons/product_visible_discount/i18n/es.po
+++ b/addons/product_visible_discount/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-23 09:42+0000\n"
+"PO-Revision-Date: 2010-12-28 08:26+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -94,7 +94,7 @@ msgstr "¡Primero debe definir una tarifa para el proveedor!"
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML no válido para la definición de la vista!"
diff --git a/addons/profile_tools/i18n/es.po b/addons/profile_tools/i18n/es.po
index ad73ca8bf3e..e3d7f63da26 100644
--- a/addons/profile_tools/i18n/es.po
+++ b/addons/profile_tools/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 22:44+0000\n"
+"PO-Revision-Date: 2010-12-28 08:34+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_tools
@@ -50,6 +50,8 @@ msgstr ""
 #: help:misc_tools.installer,lunch:0
 msgid "A simple module to help you to manage Lunch orders."
 msgstr ""
+"Un módulo simple que le permite gestionar las órdenes de comida (pizzas, "
+"menús, ...)."
 
 #. module: profile_tools
 #: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index c727123e2cc..2cfee43022f 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:11+0000\n"
+"PO-Revision-Date: 2010-12-28 08:41+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -360,7 +360,7 @@ msgstr "Cabecera correo"
 #. module: project
 #: view:project.installer:0
 msgid "Configure Your Project Management Application"
-msgstr ""
+msgstr "Configure su aplicación de gestión de proyectos"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -790,7 +790,7 @@ msgstr "Nuevo título de la tarea delegada al usuario."
 #. module: project
 #: view:report.project.task.user:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: project
 #: view:project.installer:0
@@ -798,6 +798,8 @@ msgid ""
 "Various OpenERP applications are available to manage your projects with "
 "different level of control and flexibility."
 msgstr ""
+"Están disponibles varias aplicaciones OpenERP para gestionar sus proyectos "
+"con varios niveles de control y flexibilidad."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -1016,6 +1018,16 @@ msgid ""
 "Project application in order to invoice the time spent on a task, you can "
 "choose to invoice or not one project in the billing section."
 msgstr ""
+"Un proyecto contiene un conjunto de tareas o actividades que se llevarán a "
+"cabo por el personal asignado. Un proyecto puede ser puesto en una "
+"jerarquía, como un hijo de un proyecto padre. Esto le permite diseñar la "
+"estructura de grandes proyectos con las distintas fases repartidas en el "
+"ciclo de duración del proyecto. Cada usuario puede configurar su proyecto "
+"por defecto en sus propias preferencias, con el fin de filtrar de forma "
+"automática las tareas o actividades en las que normalmente trabaja. Si ha "
+"personalizado la aplicación de proyectos con el fin de facturar el tiempo "
+"dedicado a una tarea, puede elegir si facturar o no un proyecto en la "
+"sección de facturación."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1132,7 +1144,7 @@ msgstr "Etapas"
 #. module: project
 #: view:project.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: project
 #: view:project.project:0
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 34a47aba91b..f4c837e5d21 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -41,7 +41,8 @@
                             </group>
                             <group col="2" colspan="2" name="misc">
                                 <separator colspan="2" string="Miscelleanous"/>
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
+                                <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                                 <field name="warn_manager"/>
                             </group>
                             <newline/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 86f79857104..77dce617c7f 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -2,7 +2,9 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
+        <menuitem id="base.menu_project_report" name="Reporting"
+            groups="project.group_project_manager"
+            parent="base.menu_main_pm" sequence="50"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
             <field name="name">report.project.task.user.tree</field>
@@ -10,7 +12,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tasks Analysis">
-                	<field name="name" invisible="1"/>
+                    <field name="name" invisible="1"/>
                     <field name="project_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
@@ -43,13 +45,13 @@
             <field name="model">report.project.task.user</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-	            <graph string="Tasks Analysis" type="bar">
-	                 <field name="name"/>
-	                 <field name="state" group="True"/>
-	                 <field name="no_of_days" operator="+"/>
-	             </graph>
-         	</field>
-    	</record>
+                <graph string="Tasks Analysis" type="bar">
+                     <field name="name"/>
+                     <field name="state" group="True"/>
+                     <field name="no_of_days" operator="+"/>
+                 </graph>
+             </field>
+        </record>
 
         <record id="view_task_project_user_search" model="ir.ui.view">
             <field name="name">report.project.task.user.search</field>
@@ -57,52 +59,52 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
-                	<group colspan="10" col="12">
-	                    <filter icon="terp-go-year" string="  Year  "
+                    <group colspan="10" col="12">
+                        <filter icon="terp-go-year" string="  Year  "
                                 domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
-	                    	    help="Current Year"/>
-	                    <filter icon="terp-go-month" string="   Month   "
-	                    		name="month"
-	                    		domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-	                    		help="Current Month"/>
-		                <filter icon="terp-go-week"
-	                            string="    Month-1    "
-	                            separator="1"
+                                help="Current Year"/>
+                        <filter icon="terp-go-month" string="   Month   "
+                                name="month"
+                                domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                                help="Current Month"/>
+                        <filter icon="terp-go-week"
+                                string="    Month-1    "
+                                separator="1"
                                 domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-	                            help="Previous Month"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Draft"
-	                    		icon="terp-document-new"
-	                    		domain="[('state','=','draft')]"
-	                    		help = "Draft tasks"/>
-		                <filter string="Current"
-		                		icon="terp-check"
-		                		domain="[('state', '=' ,'open')]"
-		                		help = "In progress tasks"/>
-	                   	<filter string="Pending"
-	                   			icon="terp-gtk-media-pause"
-	                   			domain="[('state','=','pending')]"
-	                   			help = "Pending tasks"/>
-                      	<filter string="Done"
-                    			icon="terp-dialog-close"
-                    			name="done"
-                    			domain="[('state','=','done')]"/>
+                                help="Previous Month"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Draft"
+                                icon="terp-document-new"
+                                domain="[('state','=','draft')]"
+                                help = "Draft tasks"/>
+                        <filter string="Current"
+                                icon="terp-check"
+                                domain="[('state', '=' ,'open')]"
+                                help = "In progress tasks"/>
+                           <filter string="Pending"
+                                   icon="terp-gtk-media-pause"
+                                   domain="[('state','=','pending')]"
+                                   help = "Pending tasks"/>
+                          <filter string="Done"
+                                icon="terp-dialog-close"
+                                name="done"
+                                domain="[('state','=','done')]"/>
                        <separator orientation="vertical"/>
-	                    <field name="project_id">
-	                        <filter icon="terp-folder-violet"
-	                        		string="My Projects"
-	                        		help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
+                        <field name="project_id">
+                            <filter icon="terp-folder-violet"
+                                    string="My Projects"
+                                    help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
                           </field>
 
                           <field name="user_id" widget="selection">
-	                        <filter icon="terp-personal"
-	                        		string="My Task"
-	                        		help = "My tasks"
-	                        		domain="[('user_id','=',uid)]" />
-	                        <filter icon="terp-personal-"
-	                        		string="Non Assigned Tasks to users"
-	                        		help="Non Assigned Tasks to users"
-	                        		domain="[('user_id','=',False)]"/>
+                            <filter icon="terp-personal"
+                                    string="My Task"
+                                    help = "My tasks"
+                                    domain="[('user_id','=',uid)]" />
+                            <filter icon="terp-personal-"
+                                    string="Non Assigned Tasks to users"
+                                    help="Non Assigned Tasks to users"
+                                    domain="[('user_id','=',False)]"/>
                           </field>
                       <field name="partner_id" />
                     </group>
@@ -149,7 +151,7 @@
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
-        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
+        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
 
    <!-- Views and action for project dashboard -->
    <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
@@ -187,7 +189,7 @@
         <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
     </record>
 
-	<record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
+    <record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_project_vs_remaining_hours_tree"/>
@@ -275,7 +277,7 @@
         <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
     </record>
 
-	<record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
+    <record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index fb237e88769..659948bc4d0 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -6,7 +6,7 @@
 "access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1
 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
-"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,0
+"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
 "access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",1,1,1,1
 "access_report_project_task_user","report.project.task.user","model_report_project_task_user","project.group_project_manager",1,1,1,1
@@ -21,3 +21,4 @@
 "access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
 "access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
 "access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
+"access_account_analytic_line_project","account.analytic.line project","analytic.model_account_analytic_line","project.group_project_manager",1,1,1,1
diff --git a/addons/project_caldav/i18n/es.po b/addons/project_caldav/i18n/es.po
index acd3def4c24..733c423bcca 100644
--- a/addons/project_caldav/i18n/es.po
+++ b/addons/project_caldav/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:28+0000\n"
+"PO-Revision-Date: 2010-12-28 08:43+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
@@ -333,7 +333,7 @@ msgstr "Recordar"
 #. module: project_caldav
 #: model:ir.module.module,description:project_caldav.module_meta_information
 msgid " Synchronize between Project task and Caldav Vtodo."
-msgstr ""
+msgstr " Sincroniza entre tareas de proyecto y Caldav Vtodo."
 
 #. module: project_caldav
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/es.po b/addons/project_gtd/i18n/es.po
index f9debee54b1..1529d511414 100644
--- a/addons/project_gtd/i18n/es.po
+++ b/addons/project_gtd/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:08+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 07:50+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -194,6 +193,23 @@ msgid ""
 "performing those tasks.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo implementa todos los conceptos definidos por la metodología\n"
+"Getting Things Done. Esta metodología reconocida mundialmente se usa\n"
+"para la mejorar la gestión del tiempo personal.\n"
+"\n"
+"Getting Things Done (habitualmente abreviado como GTD) es un método de "
+"gestión\n"
+"de actividades creado por David Allen, y descrito en un libro con el mismo "
+"nombre.\n"
+"\n"
+"GTD se basa en el principio de que una persona necesita liberar la mente de "
+"tareas\n"
+"anotándolas externamente. De ese modo, la mente es libre de recordar todo "
+"lo\n"
+"que hay que hacer, y se puede concentrar en realizar realmente\n"
+"esas tareas.\n"
+"    "
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index db0d7187500..7a36b3e6ead 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -54,7 +54,7 @@ class project_timebox_fill(osv.osv_memory):
         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 {}
+        return {'type': 'ir.actions.act_window_close'}
 
 project_timebox_fill()
 
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index c4bee877127..4ca0fbf2279 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -174,9 +174,8 @@
             <field name="view_id" ref="view_project_issue_report_graph"/>
             <field name="act_window_id" ref="action_project_issue_report"/>
         </record>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
-        <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
+        <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree"
+            parent="base.menu_project_report"/>
 
 
   </data>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index f5602f5ae4b..177533462a0 100755..100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -1,14 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
 "access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
-"access_project_issue","project.issue","model_project_issue","project_issue.group_project_supporter",1,1,1,1
 "access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
-"access_project_issue_report","project.issue.report","model_project_issue_report","project_issue.group_project_supporter",1,1,1,1
 "access_crm_case_categ_id","crm.case.categ","crm.model_crm_case_categ","project.group_project_manager",1,1,1,1
-"access_crm_case_categ_supp","crm.case.categ","crm.model_crm_case_categ","project_issue.group_project_supporter",1,0,0,0
 "access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
-"access_project_issue_version","project_issue_version manager","model_project_issue_version","project_issue.group_project_supporter",1,0,0,0
+"access_project_issue_version_project_user","project_issue_version user","model_project_issue_version","project.group_project_user",1,0,0,0
 "access_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
 "access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
-"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,1,1,0
+"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
 "access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
index d0aeabafc05..c3119073a75 100644
--- a/addons/project_issue/security/project_issue_security.xml
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-	     <record id="group_project_supporter" model="res.groups">
-	        <field name="name">Project / Support Manager</field>
-	    </record>
- 	</data>
+    </data>
 </openerp>
diff --git a/addons/project_issue_sheet/i18n/es.po b/addons/project_issue_sheet/i18n/es.po
index b26ed7044e3..35a84f00278 100644
--- a/addons/project_issue_sheet/i18n/es.po
+++ b/addons/project_issue_sheet/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 20:03+0000\n"
+"PO-Revision-Date: 2010-12-28 07:37+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue_sheet
@@ -26,6 +26,10 @@ msgid ""
 "Issues/Bugs Management in Project\n"
 "                "
 msgstr ""
+"\n"
+"                    Este módulo añade el soporte de hojas de servicios para "
+"la gestión de incidencias/errores en proyectos\n"
+"                "
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
index 1a9081b1f5d..d446ef20183 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -44,7 +44,7 @@ class project_schedule_task(osv.osv_memory):
         if context is None:
             context = {}
         if not 'active_id' in context:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
         return phase_pool.schedule_tasks(cr, uid, [context['active_id']], context=context)
 project_schedule_task()
 
diff --git a/addons/project_mailgate/i18n/es.po b/addons/project_mailgate/i18n/es.po
index b217445f938..b0dd743ae98 100644
--- a/addons/project_mailgate/i18n/es.po
+++ b/addons/project_mailgate/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:09+0000\n"
+"PO-Revision-Date: 2010-12-28 08:35+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mailgate
@@ -50,7 +50,7 @@ msgstr ""
 #. module: project_mailgate
 #: view:project.task:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjuntos"
 
 #. module: project_mailgate
 #: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
diff --git a/addons/project_messages/i18n/es.po b/addons/project_messages/i18n/es.po
index 627b8e427ea..9c503ee6ae1 100644
--- a/addons/project_messages/i18n/es.po
+++ b/addons/project_messages/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:02+0000\n"
+"PO-Revision-Date: 2010-12-28 08:51+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_messages
@@ -37,7 +37,7 @@ msgstr "De"
 #: model:ir.actions.act_window,name:project_messages.messages_form
 #: model:ir.ui.menu,name:project_messages.menu_messages_form
 msgid "Communication Messages"
-msgstr ""
+msgstr "Mensajes de comunicación"
 
 #. module: project_messages
 #: help:project.messages,to_id:0
@@ -97,6 +97,13 @@ msgid ""
 "    it to all the users.\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo proporciona la funcionalidad de enviar mensajes en un "
+"proyecto.\n"
+"    Un usuario puede enviar mensajes individualmente a otro usuario. También "
+"puede enviarlos\n"
+"    a todos los usuarios del proyecto.\n"
+"    "
 
 #. module: project_messages
 #: view:project.messages:0
diff --git a/addons/project_mrp/i18n/es.po b/addons/project_mrp/i18n/es.po
index ac3c513b410..568839242f3 100644
--- a/addons/project_mrp/i18n/es.po
+++ b/addons/project_mrp/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:11+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 07:59+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
@@ -121,6 +120,27 @@ msgid ""
 "automatically created via sale orders.\n"
 "\n"
 msgstr ""
+"\n"
+"Este módulo crea un enlace entre órdenes de abastecimiento\n"
+"conteniendo líneas de \"servicio\" y tareas de gestión de proyectos.\n"
+"\n"
+"Cuando se instala, este módulo creará una nueva tarea por cada línea\n"
+"de orden de abastecimiento, cuando el producto correspondiente\n"
+"cumpla las siguientes características:\n"
+"  * Tipo = Servicio\n"
+"  * Método abastecimiento (cubrir el pedido) = OBP (obtener bajo pedido)\n"
+"  * Método suministro/abastecimiento = Producir\n"
+"\n"
+"La nueva tarea se crea fuera de los proyectos existentes, pero\n"
+"puede ser añadida a un proyecto manualmente.\n"
+"\n"
+"Cuando la tarea de proyecto se completa o cancela, consecuentemente\n"
+"se actualiza el flujo de trabajo de la correspondiente línea de "
+"abastecimiento.\n"
+"\n"
+"Este módulo es útil para poder facturar servicios basados en tareas creadas\n"
+"automáticamente a través de pedidos de venta.\n"
+"\n"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
diff --git a/addons/project_planning/i18n/es.po b/addons/project_planning/i18n/es.po
index 128cc1e6bd9..9f382cc3b37 100644
--- a/addons/project_planning/i18n/es.po
+++ b/addons/project_planning/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-08 21:23+0000\n"
+"PO-Revision-Date: 2010-12-27 18:38+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_planning
@@ -423,6 +423,23 @@ msgid ""
 "At the end of the month, the planning manager can also check if the encoded "
 "timesheets are respecting the planned time on each analytic account.\n"
 msgstr ""
+"\n"
+"Este módulo le permite gestionar sus planificaciones.\n"
+"\n"
+"Este módulo se basa en la contabilidad analítica y está totalmente integrado "
+"con\n"
+"* la codificación de hojas de servicios\n"
+"* las gestión de las vacaciones/fiestas\n"
+"* la gestión de proyectos\n"
+"\n"
+"De esta forma, cada responsable de departamento puede saber si alguien en su "
+"equipo aún tiene tiempo no asignado para una cierta planificación (teniendo "
+"en cuenta las vacaciones validadas) o si todavía lo necesita para codificar "
+"tareas.\n"
+"\n"
+"Al final del mes, el responsable de planificación también puede comprobar si "
+"las hojas de servicios codificadas están respetando el tiempo planificado en "
+"cada cuenta analítica.\n"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_res_company
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index dc89bcd4d31..46cc225153e 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -64,12 +64,12 @@ class report_account_analytic_planning(osv.osv):
             ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context)
             if ids_dept:
                 data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context)
-                childs = map(lambda x: x['member_ids'], data_dept)
-                childs = tools.flatten(childs)
-                childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)], context=context)
-                if user_id in childs:
-                    childs.remove(user_id)
-                child_ids.extend(tools.flatten(childs))
+                children = map(lambda x: x['member_ids'], data_dept)
+                children = tools.flatten(children)
+                children = obj_user.search(cr, uid, [('id', 'in', children),('active', '=', True)], context=context)
+                if user_id in children:
+                    children.remove(user_id)
+                child_ids.extend(tools.flatten(children))
                 set = {}
                 map(set.__setitem__, child_ids, [])
                 child_ids = set.keys()
diff --git a/addons/project_retro_planning/i18n/es.po b/addons/project_retro_planning/i18n/es.po
index aabf66e63f9..777745ced2a 100644
--- a/addons/project_retro_planning/i18n/es.po
+++ b/addons/project_retro_planning/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:41+0000\n"
+"PO-Revision-Date: 2010-12-28 08:49+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
@@ -35,6 +35,10 @@ msgid ""
 "          then the deadline date and start date for all the tasks will "
 "change accordingly  "
 msgstr ""
+"\n"
+"        - Si la fecha de finalización del proyecto se cambia,\n"
+"          la fecha límite y la fecha de inicio de todas las tares se "
+"cambiarán en consecuencia  "
 
 #. module: project_retro_planning
 #: constraint:project.project:0
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_merger.py b/addons/project_scrum/wizard/project_scrum_backlog_merger.py
index 6672a83dc5c..c90ca26086b 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_merger.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_merger.py
@@ -97,7 +97,7 @@ class project_scrum_backlog_merge(osv.osv_memory):
         #To assing a new product backlog to merged tasks
         task_obj.write(cr, uid, task_lines, {'product_backlog_id': id_b})
         backlog_obj.unlink(cr, uid, context['active_ids'], context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 project_scrum_backlog_merge()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_sprint.py b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
index 52704fe1097..591e1d5da62 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
@@ -62,7 +62,7 @@ class backlog_sprint_assign(osv.osv_memory):
             message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is assigned sprint:%s"%(sprint.name))
             self.log(cr, uid, backlog.id, message)
         backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 backlog_sprint_assign()
 
diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py
index 3fca16e555f..ae8ba092981 100644
--- a/addons/project_scrum/wizard/project_scrum_email.py
+++ b/addons/project_scrum/wizard/project_scrum_email.py
@@ -103,5 +103,5 @@ class project_scrum_email(osv.osv_memory):
             tools.email_send(user_email, [data.scrum_master_email], data.subject, body, reply_to=user_email)
         if data.product_owner_email:
             tools.email_send(user_email, [data.product_owner_email], data.subject, body, reply_to=user_email)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 project_scrum_email()
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index f14ccc27de6..f162d9ae0c6 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-05-25 15:04+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 07:48+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
@@ -21,6 +21,7 @@ msgstr ""
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
+"Nie zdefiniowano pracownika dla użytkownika \"%s\". Musisz go utworzyć."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -29,16 +30,18 @@ msgid ""
 "No journal defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Nie zdefiniowano dziennika dla pracownika.\n"
+"Wprowadź w formularzu pracownika w zakładce karta pracy."
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr ""
+msgstr "Zadanie karty pracy"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Przeszukaj pozycje analityczne"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -48,49 +51,49 @@ msgstr "ID związanej karty czasu pracy"
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Praca w zadaniu"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Twórz faktury z pozycji zamówienia sprzedaży"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Godziny zadania"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Błąd ! data początkowa projektu musi być mniejsza od daty końcowej."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Year "
-msgstr ""
+msgstr " Rok "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -100,99 +103,99 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzec"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Sierpień"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Faktura zadania"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Przebieg zadania"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych zadań."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Journal"
-msgstr ""
+msgstr "Dziennik"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Czerwiec"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Moje zapisy"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Zadanie"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Fakturuj przebieg zadania"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Błąd! Nie możesz wiązać przedziału do tego samego projektu!"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozszerzone filtry..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Uzupełnij swją kartę pracy"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoiceable"
-msgstr ""
+msgstr "Do fakturowania"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Klient"
 
 #. module: project_timesheet
 #: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -209,47 +212,47 @@ msgstr ""
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Fakturuj przebieg zadania"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Godziny karty czasu pracy"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "Zapis zadania"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Podsumowanie zadania wchodzi do pozycji karty czasu pracy"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Wyzwól fakturę"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Zadania wg użytkowników"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -258,73 +261,75 @@ msgid ""
 "No product defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Nie zdefiniowano produktu dla użytkownika.\n"
+"Uzupełnij zakładkę karty czasu pracy na formularzu pracownika."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dane fakturowane"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Konto fin."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month "
-msgstr ""
+msgstr " Miesiąc "
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Raport godzin karty czasu pracy/zadania na miesiąc"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
 #, python-format
 msgid "Bad Configuration !"
-msgstr ""
+msgstr "Błędna konfiguracja !"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturowanie"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Przebieg zadania"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Miesiąc-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Kiedy zadanie jest wypełnione, utwórz do niego fakturę."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
@@ -335,7 +340,7 @@ msgstr ""
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
@@ -345,12 +350,12 @@ msgstr "Karta czasu pracy projektu"
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Zapisz czas spędzony na zadaniu"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Fakturuj przebieg zadania"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -360,18 +365,20 @@ msgid ""
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Nie zdefiniowano produktu ani kategorii produktu dla pracownika.\n"
+"Uzupełnij zakładkę karty czasu pracy na formularzu pracownika."
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Godziny zadania na miesiąc"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr ""
+msgstr "Wypełnij kartę czasu pracy"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -379,3 +386,5 @@ msgid ""
 "This lists show you every task work you can invoice to the customer. Select "
 "the lines in order to generate the invoices automatically."
 msgstr ""
+"Ta lista pokazuje ci wszystkie zadania, które można zafakturować na klienta. "
+"Wybierz pozycje, aby automatycznie utworzyć fakturę."
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index f66d769891a..a56e04e7a52 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-21 14:12+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:13+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -94,7 +95,7 @@ msgstr "¿Desea generar las facturas de proveedor?"
 #: code:addons/purchase/purchase.py:0
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "El proveedor seleccionado sólo vende este producto por %s"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:0
@@ -596,7 +597,7 @@ msgstr "Para facturar"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 msgid "Pricelists"
-msgstr ""
+msgstr "Tarifas"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
@@ -623,7 +624,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Facturas generadas para un pedido de compra"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -854,7 +855,7 @@ msgstr "Abastecimiento"
 #: view:purchase.order:0
 #: field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Facturas"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
@@ -1017,6 +1018,9 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"Un pedido de compra genera una factura de proveedor, tan pronto como la "
+"confirme el comprador. En función del control de facturación del pedido de "
+"compra, la factura se basa en las cantidades recibidas u ordenadas."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1119,6 +1123,10 @@ msgid ""
 "your receptions. Once you receive a supplier invoice, you can control it "
 "according to the draft of invoice and validate it."
 msgstr ""
+"Utilice este menú para controlar las facturas que se reciban de su "
+"proveedor. OpenERP pre-genera facturas borrador basadas en sus pedidos de "
+"compra o de sus recepciones. Una vez que reciba una factura de proveedor, "
+"puede compararla con la factura borrador y validarla."
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:0
@@ -1160,6 +1168,17 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    El módulo de compras permite generar pedidos de compra para adquirir "
+"bienes de un proveedor.\n"
+"    Una factura de proveedor se crea para el pedido realizado en "
+"particular.\n"
+"    Cuadro de mandos para la gestión de compras que incluye:\n"
+"    * Pedidos actuales de compra.\n"
+"    * Pedidos de compra en borrador.\n"
+"    * Gráfico de cantidad y monto por mes.    \n"
+"\n"
+"    "
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -1168,6 +1187,8 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
 "less."
 msgstr ""
+"El proveedor seleccionado tiene establecida una cantidad mínima a %s, no "
+"puede comprar menos."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1456,6 +1477,11 @@ msgid ""
 "Purchase Order and generate the next steps: draft reception of the products, "
 "invoice to control."
 msgstr ""
+"Con el menú de solicitudes de presupuesto puede crear una nueva solicitud de "
+"presupuesto, revisar las existentes y confirmarlas una vez la oferta del "
+"proveedor es aprobada. Cuando se confirma una solicitud de presupuesto, "
+"OpenERP lo convertirá en un pedido de compra y generará los siguientes "
+"pasos: recepción en borrador de los productos, factura de control."
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -1646,6 +1672,18 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Tenga en cuenta que: \n"
+" \n"
+" Los pedidos sólo se fusionarán si: \n"
+" * Los pedidos de compra están en borrador. \n"
+" * Los pedidos pertenecen al mismo proveedor. \n"
+" * Los pedidos tienen la misma ubicación de stock y la misma lista de "
+"precios. \n"
+" \n"
+" Las líneas sólo se fusionarán si: \n"
+" * Las líneas de pedido son exactamente iguales excepto por el producto, "
+"cantidad y unidades. \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
@@ -1694,6 +1732,14 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * El estado 'Borrador' se establece automáticamente cuando crea un pedido "
+"(presupuesto) de compra.                                        \n"
+"* El estado 'Confirmado' se establece automáticamente al confirmar el pedido "
+"de compra.                                        \n"
+"* El estado 'Hecho' se establece automáticamente cuando el pedido de compra "
+"se realiza.                                        \n"
+"* El estado 'Cancelado' se establece automáticamente cuando el usuario "
+"cancela un pedido de compra."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -1709,7 +1755,7 @@ msgstr "Total"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Versiones de tarifa"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1760,6 +1806,9 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Se crea automáticamente la factura si el control de facturación del pedido "
+"de compra es 'Desde pedido'. La factura también puede ser generada "
+"manualmente por el contable (control facturación = Manual)."
 
 #. module: purchase
 #: view:purchase.report:0
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 3a768a4c218..0de19189fc3 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -220,6 +220,9 @@ class purchase_order(osv.osv):
         'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
     }
+    _sql_constraints = [
+        ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
+    ]
     _name = "purchase.order"
     _description = "Purchase Order"
     _order = "name desc"
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index d08f602d158..c2a01c5b846 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -259,7 +259,7 @@
             <field name="help">With the Requests for Quotation menu you can create new requests for quotations, review existing ones or turn them into a purchase order once the supplier offer is approved. When you confirm a RfQ, OpenERP will convert it to a Purchase Order and generate the next steps: draft reception of the products, draft invoice to control.</field>
         </record>
         <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
-                sequence="6" groups="group_purchase_manager,group_purchase_user"/>
+                sequence="6"/>
 
         <record id="purchase_form_action" model="ir.actions.act_window">
             <field name="name">Purchase Orders</field>
@@ -407,6 +407,7 @@
             context="{'search_default_partner_id': [active_id]}"
             id="act_res_partner_2_purchase_order"
             name="Purchase Orders"
+            groups="purchase.group_purchase_user"
             res_model="purchase.order"
             src_model="res.partner"/>
 
@@ -416,7 +417,7 @@
             name="Purchases"
             res_model="purchase.order.line"
             src_model="product.product"
-            groups="base.group_extended"/>
+            groups="purchase.group_purchase_user"/>
 
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index f30d65d8f28..8c5510852ca 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -52,7 +52,7 @@ class purchase_report(osv.osv):
         'date_approve':fields.date('Date Approved', readonly=True),
         'expected_date':fields.date('Expected Date', readonly=True),
         'validator' : fields.many2one('res.users', 'Validated By', readonly=True),
-        'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True),
+        'product_uom' : fields.many2one('product.uom', 'Reference UoM', required=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
         'delay':fields.float('Days to Validate', digits=(16,2), readonly=True),
@@ -92,16 +92,20 @@ class purchase_report(osv.osv):
                     s.company_id as company_id,
                     l.product_id,
                     t.categ_id as category_id,
-                    l.product_uom as product_uom,
+                    (case when u.uom_type not in ('reference') then
+                            (select id from product_uom where uom_type='reference' and category_id = 1)
+                    else
+                        u.id
+                    end) as product_uom,
                     s.location_id as location_id,
-                    sum(l.product_qty*u.factor) as quantity,
+                    sum(l.product_qty/u.factor) as quantity,
                     extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
                     extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
                     count(*) as nbr,
                     (l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total,
                     avg(100.0 * (l.price_unit*l.product_qty*u.factor) / (t.standard_price*l.product_qty*u.factor))::decimal(16,2) as negociation,
                     sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard,
-                    (sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
+                    (sum(l.product_qty*l.price_unit)/sum(l.product_qty/u.factor))::decimal(16,2) as price_average
                 from purchase_order s
                     left join purchase_order_line l on (s.id=l.order_id)
                         left join product_product p on (l.product_id=p.id)
@@ -131,7 +135,10 @@ class purchase_report(osv.osv):
                     to_char(s.date_order, 'MM'),
                     to_char(s.date_order, 'YYYY-MM-DD'),
                     s.state,
-                    s.warehouse_id
+                    s.warehouse_id,
+                    u.uom_type, 
+                    u.category_id,
+                    u.id
             )
         """)
 purchase_report()
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 8bf381b4d41..7f52ca73cf0 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -101,7 +101,7 @@
  					<separator orientation="vertical"/>
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Category" name="group_category_id" icon="terp-accessories-archiver" context="{'group_by':'category_id'}"/>
-                    <filter string="Product UOM" name="group_product_uom" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
+                    <filter string="Reference UOM" name="group_product_uom" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 7857fa4586d..95f433247c5 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -7,10 +7,10 @@
 "access_stock_warehouse_purchase_user","stock.warehouse","stock.model_stock_warehouse","group_purchase_user",1,0,0,0
 "access_stock_picking_purchase_user","stock.picking","stock.model_stock_picking","group_purchase_user",1,1,1,1
 "access_stock_move_purchase_user","stock.move","stock.model_stock_move","group_purchase_user",1,1,1,1
-"access_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,1,1,0
-"access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,1,0
+"access_purchase_order_stock_worker","purchase.order","model_purchase_order","stock.group_stock_user",1,0,0,0
+"access_purchase_order_line_stock_worker","purchase.order.line","model_purchase_order_line","stock.group_stock_user",1,0,0,0
 "access_account_tax_purchase_user","account.tax","account.model_account_tax","group_purchase_user",1,0,0,0
-"access_report_purchase_order","purchase.report","model_purchase_report","group_purchase_manager",1,1,1,1
+"access_report_purchase_order","purchase.report","model_purchase_report","group_purchase_manager",1,0,0,0
 "access_report_purchase_order_user","purchase.report user","model_purchase_report","group_purchase_user",1,0,0,0
 "access_purchase_order_line_manager","purchase.order.line","model_purchase_order_line","group_purchase_manager",1,1,1,1
 "access_stock_location_purchase_user_manager","stock.location","stock.model_stock_location","group_purchase_manager",1,0,0,0
@@ -36,11 +36,32 @@
 "access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,0,0,0
 "access_account_period","account.period","account.model_account_period","group_purchase_user",1,0,0,0
 "access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","group_purchase_user",1,0,0,0
-"access_account_move","account.move","account.model_account_move","group_purchase_user",1,1,1,1
+"access_account_move","account.move","account.model_account_move","group_purchase_user",1,0,0,0
 "access_account_move_line","account.move.line","account.model_account_move_line","group_purchase_user",1,0,0,0
 "access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_purchase_user",1,0,0,0
 "access_account_move_reconcile","account.move.reconcile","account.model_account_move_reconcile","group_purchase_user",1,0,0,0
-"access_report_stock_move","report.stock.move.manager","stock.model_report_stock_move","group_purchase_manager",1,1,1,1
+"access_report_stock_move","report.stock.move.manager","stock.model_report_stock_move","group_purchase_manager",1,0,0,0
 "access_report_stock_move_user","report.stock.move.user","stock.model_report_stock_move","group_purchase_user",1,0,0,0
-"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,0,1,0
-"access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,0,1,0
+"access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,1,1,0
+"access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,1,1,0
+"access_res_partner_purchase_manager","res.partner.purchase.manager","base.model_res_partner","group_purchase_manager",1,1,1,1
+"access_product_uom_categ_purchase_manager","product.uom.categ purchase_manager","product.model_product_uom_categ","purchase.group_purchase_manager",1,1,1,1
+"access_product_uom_purchase_manager","product.uom purchase_manager","product.model_product_uom","purchase.group_purchase_manager",1,1,1,1
+"access_product_ul_purchase_manager","product.ul purchase_manager","product.model_product_ul","purchase.group_purchase_manager",1,1,1,1
+"access_product_category_purchase_manager","product.category purchase_manager","product.model_product_category","purchase.group_purchase_manager",1,1,1,1
+"access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","purchase.group_purchase_manager",1,1,1,1
+"access_product_product_purchase_manager","product.product purchase_manager","product.model_product_product","purchase.group_purchase_manager",1,1,1,1
+"access_product_packaging_purchase_manager","product.packaging purchase_manager","product.model_product_packaging","purchase.group_purchase_manager",1,1,1,1
+"access_product_supplierinfo_purchase_manager","product.supplierinfo purchase_manager","product.model_product_supplierinfo","purchase.group_purchase_manager",1,1,1,1
+"access_pricelist_partnerinfo_purchase_manager","pricelist.partnerinfo purchase_manager","product.model_pricelist_partnerinfo","purchase.group_purchase_manager",1,1,1,1
+"access_product_price_type_purchase_manager","product.price.type purchase_manager","product.model_product_price_type","purchase.group_purchase_manager",1,1,1,1
+"access_product_pricelist_type_purchase_manager","product.pricelist.type purchase_manager","product.model_product_pricelist_type","purchase.group_purchase_manager",1,1,1,1
+"access_product_pricelist_purchase_manager","product.pricelist purchase_manager","product.model_product_pricelist","purchase.group_purchase_manager",1,1,1,1
+"access_ir_property_group_purchase_manager","ir_property group_purchase_manager","base.model_ir_property","purchase.group_purchase_manager",1,1,1,1
+"access_product_group_res_partner_purchase_manager","res_partner group_purchase_manager","base.model_res_partner","purchase.group_purchase_manager",1,1,1,1
+"access_product_pricelist_version_purchase_manager","product.pricelist.version purchase_manager","product.model_product_pricelist_version","purchase.group_purchase_manager",1,1,1,1
+"access_product_pricelist_item_purchase_manager","product.pricelist.item purchase_manager","product.model_product_pricelist_item","purchase.group_purchase_manager",1,1,1,1
+"access_account_account_purchase_manager","account.account purchase manager","account.model_account_account","purchase.group_purchase_manager",1,0,0,0
+"access_account_journal_purchase_manager","account.journal purchase manager","account.model_account_journal","purchase.group_purchase_manager",1,0,0,0
+"access_stock_tracking_purchase_user","stock.tracking purchase.user","stock.model_stock_tracking","purchase.group_purchase_user",1,1,1,0
+"access_stock_location_purchase_manager","stock.location purchase manager","stock.model_stock_location","purchase.group_purchase_manager",1,0,0,0
diff --git a/addons/purchase/test/purchase_from_order.yml b/addons/purchase/test/purchase_from_order.yml
index 454580baaf4..ca089db7821 100644
--- a/addons/purchase/test/purchase_from_order.yml
+++ b/addons/purchase/test/purchase_from_order.yml
@@ -31,7 +31,6 @@
     date_order: '2010-05-11'
     invoice_method: order
     location_id: stock.stock_location_stock
-    name: PO00003
     order_line:
       - date_planned: '2010-05-13'
         name: iPod
diff --git a/addons/purchase_analytic_plans/i18n/es.po b/addons/purchase_analytic_plans/i18n/es.po
index f2f94bf2341..e8a736a784e 100644
--- a/addons/purchase_analytic_plans/i18n/es.po
+++ b/addons/purchase_analytic_plans/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:47+0000\n"
+"PO-Revision-Date: 2010-12-28 09:17+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
@@ -39,6 +39,10 @@ msgid ""
 "    The base module to manage analytic distribution and purchase orders.\n"
 "    "
 msgstr ""
+"\n"
+"    El módulo base para gestionar distribuciones analíticas y pedidos de "
+"compra.\n"
+"    "
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index b0a8b453730..8dba2ab2eae 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -139,7 +139,7 @@ class purchase_requisition_partner(osv.osv_memory):
                             'order_id': purchase_id
                         })
                     order_line_obj.create(cr,uid,order_line)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 purchase_requisition_partner()
 
diff --git a/addons/report_designer/i18n/es.po b/addons/report_designer/i18n/es.po
index 823e73c7400..3f4ea9c6a72 100644
--- a/addons/report_designer/i18n/es.po
+++ b/addons/report_designer/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:24+0000\n"
+"PO-Revision-Date: 2010-12-28 09:04+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_designer
@@ -32,7 +32,7 @@ msgstr "Constructor de consultas"
 #. module: report_designer
 #: view:report_designer.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: report_designer
 #: view:report_designer.installer:0
@@ -65,11 +65,13 @@ msgid ""
 "OpenERP's built-in reporting abilities can be improved even further with "
 "some of the following applications"
 msgstr ""
+"Las capacidades de generación de informes incorporadas en OpenERP pueden ser "
+"mejoradas aún más con algunas de las siguientes aplicaciones"
 
 #. module: report_designer
 #: view:report_designer.installer:0
 msgid "Configure Reporting Tools"
-msgstr ""
+msgstr "Configure las herramientas de informes"
 
 #. module: report_designer
 #: help:report_designer.installer,base_report_creator:0
@@ -87,6 +89,9 @@ msgid ""
 "OpenOffice.Once you have modified it you can upload the report using the "
 "same wizard."
 msgstr ""
+"Añade asistentes para importar/exportar informes .SXW que puede modificar en "
+"OpenOffice. Una vez que lo haya modificado, puede subir el informe con el "
+"mismo asistente."
 
 #. module: report_designer
 #: model:ir.module.module,description:report_designer.module_meta_information
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index 354a0255c5b..7a7a424ee7f 100644
--- a/addons/report_intrastat/i18n/es.po
+++ b/addons/report_intrastat/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:01+0000\n"
+"PO-Revision-Date: 2010-12-28 08:50+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
@@ -197,6 +197,10 @@ msgid ""
 "    This module gives the details of the goods traded between the countries "
 "of European Union "
 msgstr ""
+"\n"
+"    Un módulo que añade informes intrastat.\n"
+"    Este módulo proporciona información de las mercancías comercializadas "
+"entre los países de la Unión Europea. "
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
diff --git a/addons/report_intrastat/security/ir.model.access.csv b/addons/report_intrastat/security/ir.model.access.csv
index 55218658330..f59d76ed536 100644
--- a/addons/report_intrastat/security/ir.model.access.csv
+++ b/addons/report_intrastat/security/ir.model.access.csv
@@ -1,4 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_report_intrastat_code","report.intrastat.code","model_report_intrastat_code","account.group_account_manager",1,1,1,1
 "access_report_intrastat","report.intrastat","model_report_intrastat","account.group_account_manager",1,0,0,0
-"access_report_intrastat_code_product_manager","report.intrastat.code product manager","model_report_intrastat_code","product.group_product_manager",1,1,1,1
+"access_report_intrastat_code_sale_manager","report.intrastat.code sale manager","model_report_intrastat_code","base.group_sale_manager",1,1,1,1
+"access_report_intrastat_code_purchase_manager","report.intrastat.code purchase manager","model_report_intrastat_code","purchase.group_purchase_manager",1,1,1,1
+"access_report_intrastat_code_stock_manager","report.intrastat.code stock manager","model_report_intrastat_code","stock.group_stock_manager",1,1,1,1
diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po
index 56fbc8ab0b4..a70efb2c719 100644
--- a/addons/report_webkit/i18n/es.po
+++ b/addons/report_webkit/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-24 13:01+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 08:00+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-25 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit
@@ -519,6 +518,12 @@ msgid ""
 "          raise except_osv(\n"
 "                _('No header defined for this Webkit report!"
 msgstr ""
+"'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('Cabecera no definida para este reporte Webkit!"
 
 #. module: report_webkit
 #: help:res.company,lib_path:0
diff --git a/addons/report_webkit/i18n/pl.po b/addons/report_webkit/i18n/pl.po
new file mode 100644
index 00000000000..cf6349db0b2
--- /dev/null
+++ b/addons/report_webkit/i18n/pl.po
@@ -0,0 +1,562 @@
+# 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: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2010-12-28 09:14+0000\n"
+"Last-Translator: OpenERP Administrators <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-12-29 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_header:0
+msgid "WebKit Header"
+msgstr "Nagłówek Webkit"
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+msgid "Webkit Template (used if Report File is not found)"
+msgstr "Szablon Webkit (stosowany nie znaleziono pliku raportu)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Tabloid 29 279.4 x 431.8 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_img
+#: model:ir.ui.menu,name:report_webkit.menu_header_img
+msgid "Header IMG"
+msgstr ""
+
+#. module: report_webkit
+#: field:res.company,lib_path:0
+msgid "Webkit Executable Path"
+msgstr "Ścieżka plików wykonywalnych Webkit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Ledger  28  431.8 x 279.4 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_img,type:0
+msgid "Image type(png,gif,jpeg)"
+msgstr "Typ obrazu (png,gif,jpeg)"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,company_id:0
+#: field:ir.header_webkit,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "path to Wkhtmltopdf is not absolute"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "DLE 26 110 x 220 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B7  21  88 x 125 mm"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Webkit render"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Folio 27  210 x 330 mm"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid ""
+"Please install executable on your system'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) or "
+"download it from here:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+\n"
+"                             ' path to the executable on the Company form."
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_img,name:0
+msgid "Name of Image"
+msgstr "Nazwa obrazu"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid ""
+"Wrong Wkhtmltopdf path set in company'+\n"
+"                                'Given path is not executable or path is "
+"wrong"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Webkit raise an error"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_webkit
+msgid "ir.header_webkit"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.action_header_webkit
+#: model:ir.ui.menu,name:report_webkit.menu_header_webkit
+msgid "Header HTML"
+msgstr "Nagłówek HTML"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
+msgstr ""
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Cancel"
+msgstr "_Anuluj"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B2  17  500 x 707 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_header_img
+msgid "ir.header_img"
+msgstr ""
+
+#. module: report_webkit
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A0  5   841 x 1189 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "C5E 24  163 x 229 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,type:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: report_webkit
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:0
+#, python-format
+msgid "Client Actions Connections"
+msgstr "Połączenia z akcjami klienta"
+
+#. module: report_webkit
+#: field:res.company,header_image:0
+msgid "Available Images"
+msgstr "Dostępne obrazy"
+
+#. module: report_webkit
+#: field:ir.header_webkit,html:0
+msgid "webkit header"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B1  15  707 x 1000 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A1  6   594 x 841 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_header:0
+msgid "The header linked to the report"
+msgstr "Nagłówek związany z raportem"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Wkhtmltopdf library path is not set in company"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.module.module,description:report_webkit.module_meta_information
+msgid ""
+"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) "
+"to support reports designed in HTML + CSS.\n"
+"The module structure and some code is inspired by the report_openoffice "
+"module.\n"
+"The module allows:\n"
+"    -HTML report definition\n"
+"    -Multi header support \n"
+"    -Multi logo\n"
+"    -Multi company support\n"
+"    -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+"    -JavaScript support \n"
+"    -Raw HTML debugger\n"
+"    -Book printing capabilities\n"
+"    -Margins definition \n"
+"    -Paper size definition\n"
+"and much more\n"
+"\n"
+"Multiple headers and logos can be defined per company.\n"
+"CSS style, header and footer body are defined per company\n"
+"\n"
+"The library to install can be found here\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"The system libraries are available for Linux, Mac OS X i386 and Windows 32.\n"
+"\n"
+"After installing the wkhtmltopdf library on the OpenERP Server machine, you "
+"need to set the\n"
+"path to the wkthtmltopdf executable file on the Company.\n"
+"\n"
+"For a sample report see also the webkit_report_sample module, and this "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov \n"
+"\n"
+"\n"
+"TODO :\n"
+"JavaScript support activation deactivation\n"
+"Collated and book format support\n"
+"Zip return for separated PDF\n"
+"Web client WYSIWYG\n"
+"                    "
+msgstr ""
+
+#. module: report_webkit
+#: view:ir.actions.report.xml:0
+#: view:res.company:0
+msgid "Webkit"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_webkit,format:0
+msgid "Select Proper Paper size"
+msgstr "Wybierz rozmiar papieru"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
+msgstr ""
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "Content and styling"
+msgstr "Zawartość i styl"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A7  11  74 x 105 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A6  10  105 x 148 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,report_webkit_data:0
+msgid "This template will be used if the main report file is not found"
+msgstr ""
+"Ten szablon będzie zastosowany, jeśli nie będzie pliku głównego raportu"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_top:0
+msgid "Top Margin (mm)"
+msgstr "Górny margines (mm)"
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Please set a header in company settings"
+msgstr "Ustaw nagłówek w ustawieniach firmy"
+
+#. module: report_webkit
+#: view:report.webkit.actions:0
+msgid "_Ok"
+msgstr ""
+
+#. module: report_webkit
+#: help:report.webkit.actions,print_button:0
+msgid ""
+"Check this to add a Print action for this Report in the sidebar of the "
+"corresponding document types"
+msgstr ""
+"Zaznacz to, aby dodać akcję Drukuj w prawym panelu odpowiednich typów "
+"dokumentów."
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B3  18  353 x 500 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.actions.report.xml,webkit_debug:0
+msgid "Enable the webkit engine debugger"
+msgstr "Włącz debugger silnika webkit"
+
+#. module: report_webkit
+#: field:ir.header_img,img:0
+msgid "Image"
+msgstr "Obraz"
+
+#. module: report_webkit
+#: field:res.company,header_webkit:0
+msgid "Available html"
+msgstr "Dostępny html"
+
+#. module: report_webkit
+#: help:report.webkit.actions,open_action:0
+msgid ""
+"Check this to view the newly added internal print action after creating it "
+"(technical view) "
+msgstr ""
+"Zaznacz to, aby zobaczyć dodane akcje drukowania po ich utworzeniu (podgląd "
+"techniczny) "
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Images"
+msgstr "Obrazy"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Portrait"
+msgstr "Pionowo"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,orientation:0
+msgid "Landscape"
+msgstr "Poziomo"
+
+#. module: report_webkit
+#: view:ir.header_webkit:0
+msgid "page setup"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B8  22  62 x 88 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A2  7   420 x 594 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:report.webkit.actions,print_button:0
+msgid "Add print button"
+msgstr "Dodaj przycisk drukowania"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A9  13  37 x 52 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_res_company
+msgid "Companies"
+msgstr "Firmy"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_bottom:0
+msgid "Bottom Margin (mm)"
+msgstr "Dolny margines (mm)"
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_report_webkit_actions
+msgid "Webkit Actions"
+msgstr "Akcje Webkit"
+
+#. module: report_webkit
+#: field:report.webkit.actions,open_action:0
+msgid "Open added action"
+msgstr "Otwórz dodaną akcję"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_right:0
+msgid "Right Margin (mm)"
+msgstr "Prawy margines (mm)"
+
+#. module: report_webkit
+#: field:ir.header_webkit,orientation:0
+msgid "Orientation"
+msgstr "Orientacja"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B6  20  125 x 176 mm"
+msgstr ""
+
+#. module: report_webkit
+#: help:ir.header_webkit,html:0
+msgid "Set Webkit Report Header"
+msgstr "Ustaw nagłówek raportu webkit"
+
+#. module: report_webkit
+#: field:ir.header_webkit,format:0
+msgid "Paper size"
+msgstr "Rozmiar papieru"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid ":B10    16  31 x 44 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_webkit,css:0
+msgid "Header CSS"
+msgstr "Nagłówek CSS"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B4  19  250 x 353 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A3  8   297 x 420 mm"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid ""
+"'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('No header defined for this Webkit report!"
+msgstr ""
+
+#. module: report_webkit
+#: help:res.company,lib_path:0
+msgid "Complete (Absolute) path to the wkhtmltopdf executable."
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_webkit,footer_html:0
+msgid "webkit footer"
+msgstr "Stopka webkit"
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,webkit_debug:0
+msgid "Webkit debug"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B0  14  1000 x 1414 mm"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.actions.report.xml,report_webkit_data:0
+msgid "Webkit Template"
+msgstr "Szablon Webkit"
+
+#. module: report_webkit
+#: model:ir.module.module,shortdesc:report_webkit.module_meta_information
+msgid "Webkit Report Engine"
+msgstr ""
+
+#. module: report_webkit
+#: field:ir.header_img,name:0
+#: field:ir.header_webkit,name:0
+msgid "Name"
+msgstr "Nazwa"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A5  9   148 x 210 mm"
+msgstr ""
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "A8  12  52 x 74 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.actions.act_window,name:report_webkit.wizard_ofdo_report_actions
+#: view:report.webkit.actions:0
+msgid "Add Print Buttons"
+msgstr "Dodaj przyciski drukowania"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
+msgstr ""
+
+#. module: report_webkit
+#: code:addons/report_webkit/webkit_report.py:0
+#, python-format
+msgid "Webkit Report template not found !"
+msgstr "Nie znaleziono szablonu raportu webkit"
+
+#. module: report_webkit
+#: field:ir.header_webkit,margin_left:0
+msgid "Left Margin (mm)"
+msgstr "Lewy margines (mm)"
+
+#. module: report_webkit
+#: view:res.company:0
+msgid "Headers"
+msgstr "Nagłówki"
+
+#. module: report_webkit
+#: help:ir.header_webkit,footer_html:0
+msgid "Set Webkit Report Footer."
+msgstr "Ustaw stopkę raportu webkit"
+
+#. module: report_webkit
+#: selection:ir.header_webkit,format:0
+msgid "B9  23  33 x 62 mm"
+msgstr ""
+
+#. module: report_webkit
+#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index a287fd24906..8a2b259351c 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -128,7 +128,7 @@ class report_webkit_actions(osv.osv_memory):
                                 )
             if res[0]:
                 if not current.open_action:
-                    return {}
+                    return {'type': 'ir.actions.act_window_close'}
                 
                 return {
                     'name': _('Client Actions Connections'),
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index 8e0c8c91ef0..c1e04ac82d7 100644
--- a/addons/resource/i18n/es.po
+++ b/addons/resource/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-16 18:07+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 08:38+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\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-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -212,6 +213,15 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Módulo para la gestión de recursos\n"
+"     Un recurso representa algo que puede ser programado en un calendario\n"
+"     (un desarrollador en una tarea o un centro de producción en órdenes de "
+"producción).\n"
+"     Este módulo gestiona un recurso calendario asociado a cada recurso.\n"
+"     También gestiona las ausencias de cada recurso.\n"
+"\n"
+"    "
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index 18ba8bb037b..576ee965121 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -4,3 +4,5 @@
 "access_resource_resource","resource.resource","model_resource_resource","base.group_system",1,0,0,0
 "access_resource_resource_all","resource.resource all","model_resource_resource",,1,0,0,0
 "access_resource_calendar_leaves","resource.calendar.leaves","model_resource_calendar_leaves","base.group_system",1,1,1,1
+
+
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 82fdc3d1d3b..7c2ae788bf7 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -17,9 +17,9 @@
                             <action width="510" name="%(sale.action_view_sales_by_month)d" string="Sales by Month"/>
                         </child1>
                         <child2>
-                            <action  name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman"/>
-                            <action  name="%(sale.action_sales_by_partner)d" string="Sales by Customer"/>
-                            <action  name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category"/>
+                            <action  name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman in last 90 days"/>
+                            <action  name="%(sale.action_sales_by_partner)d" string="Sales per Customer in last 90 days"/>
+                            <action  name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category in last 90 days"/>
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 1a72359a164..b424b841bf7 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-20 14:38+0000\n"
+"PO-Revision-Date: 2010-12-28 08:59+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -215,6 +215,8 @@ msgid ""
 "The invoice is created automatically if the shipping policy is 'Invoice from "
 "pick' or 'Invoice on order after delivery'."
 msgstr ""
+"Το τιμολόγιο δημιουργείται αυτόματα εάν η πολιτική αποστολής είναι "
+"'Τιμολόγιο από παραλαβή' ή 'Τιμολόγιο με παραγγελία μετά την παραλαβή'."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
@@ -254,7 +256,7 @@ msgstr "Συσκευασία"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "Από παραγγελία πώλησης"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -308,7 +310,7 @@ msgstr ""
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Παραμετροποίηση"
 
 #. module: sale
 #: constraint:stock.move:0
@@ -330,7 +332,7 @@ msgstr "Ιούνιος"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "Δεν μπορεί να κυρωθεί αυτή η παραγγελία πώλησης !"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
@@ -340,7 +342,7 @@ msgstr "Στατιστικά Πωλήσεων Παραγγελιών"
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "Ο αναλυτικός λογαριασμός που σχετίζεται με την παραγγελία πώλησης"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -350,12 +352,12 @@ msgstr "Οκτώβριος"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Διέυθυνση αποστολής για την τρέχουσα παραγγελία πώλησης."
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Τιμοκατάλογος για την τρέχουσα παραγγελία πώλησης."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -1485,7 +1487,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Ημερομηνία στην οποία η παραγγελία πώλησης επιβεβαιώνεται."
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1517,6 +1519,8 @@ msgstr "Εξαίρεση Τιμολογίου"
 msgid ""
 "This is a list of picking that has been generated for this sales order."
 msgstr ""
+"Αυτή είναι μια λίστα παραλαβών που δημιουργήθηκε γι' αυτήν την παραγγελία "
+"πώλησης."
 
 #. module: sale
 #: help:sale.installer,sale_margin:0
@@ -1555,12 +1559,12 @@ msgstr "   Μήνας   "
 #: view:sale.report:0
 #: field:sale.report,uom_name:0
 msgid "Default UoM"
-msgstr ""
+msgstr "Προεπιλεγμένη ΜΜ"
 
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
-msgstr ""
+msgstr "Ημερομηνία Επιβεβαίωσης"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:0
@@ -1812,7 +1816,7 @@ msgstr "Απευθείας Παράδοση"
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "Ημερολόγια Τιμολόγησης"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
@@ -1836,6 +1840,8 @@ msgstr "Το Τιμολόγιό σας δημιουργήθηκε επιτυχώ
 #, python-format
 msgid "You must first cancel all invoices attached to this sales order."
 msgstr ""
+"Πρέπει πρώτα να ακυρώσεις όλα τα τιμολόγια που συνδέονται με αυτήν την "
+"παραγγελία πώλησης."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1889,7 +1895,7 @@ msgstr "Ημερομηνία Παραγγελίας"
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Επιβεβαιωμένη παραγγελία πώλησης για τιμολόγηση."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1901,7 +1907,7 @@ msgstr ""
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "Η παραγγελία πώλησης '%s' είναι σε κατάσταση πρόχειρη."
 
 #. module: sale
 #: selection:sale.order.line,type:0
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index c61cf4c3d2a..eba3ba00864 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-26 07:49+0000\n"
+"PO-Revision-Date: 2010-12-28 07:26+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -66,7 +66,7 @@ msgstr "Configurar logística pedidos de venta"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
+msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -87,7 +87,7 @@ msgstr "IVA"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
-msgstr ""
+msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -230,7 +230,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Ventas. Realizar factura"
 
 #. module: sale
 #: view:sale.order:0
@@ -265,7 +265,7 @@ msgstr "Empaquetado"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "Desde un pedido de venta"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -344,7 +344,7 @@ msgstr "Junio"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "¡No se puede cancelar este pedido de venta!"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
@@ -354,7 +354,7 @@ msgstr "Estadísticas pedidos de venta"
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "La cuenta analítica relacionada con un pedido de venta."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -364,12 +364,12 @@ msgstr "Octubre"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Dirección de envío para el pedido de venta actual."
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Tarifa para el pedido de venta actual."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -423,12 +423,16 @@ msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
 msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
+"Debe cancelar primero los movimientos de stock asociados a esta línea de "
+"pedido de venta."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -458,6 +462,8 @@ msgid ""
 "You cannot make an advance on a sales order                              "
 "that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
+"No puede realizar un anticipo de un pedido de venta que está definido como "
+"'Factura automática después envío'."
 
 #. module: sale
 #: view:sale.order:0
@@ -470,7 +476,7 @@ msgstr "Notas"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Dirección de facturación para el pedido de venta actual."
 
 #. module: sale
 #: view:sale.installer:0
@@ -506,7 +512,7 @@ msgstr "Marzo"
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "El importe total."
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -524,6 +530,8 @@ msgid ""
 "For every sales order line, a procurement order is created to supply the "
 "sold product."
 msgstr ""
+"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
+"suministrar el producto vendido."
 
 #. module: sale
 #: view:board.board:0
@@ -536,6 +544,8 @@ msgid ""
 "Incoterm which stands for 'International Commercial terms' implies its a "
 "series of sales terms which are used in the commercial transaction."
 msgstr ""
+"Incoterm que significa 'Términos de Comercio Internacional \"implica una "
+"serie de condiciones de venta que se utilizan en la transacción comercial."
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
@@ -561,13 +571,13 @@ msgstr "# de líneas"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr ""
+msgstr "Ventas. Abrir factura"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -663,7 +673,7 @@ msgstr "Todos los presupuestos"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice On Order After Delivery"
-msgstr ""
+msgstr "Facturar pedido después de envío"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -712,7 +722,7 @@ msgstr "Ventas por mes"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "¡No se puede cancelar línea pedido de venta!"
 
 #. module: sale
 #: field:res.company,security_lead:0
@@ -740,6 +750,8 @@ msgid ""
 "It indicates that the sales order has been delivered. This field is updated "
 "only after the scheduler(s) have been launched."
 msgstr ""
+"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
+"sólo después que el planificador(es) se ha ejecutado."
 
 #. module: sale
 #: view:sale.report:0
@@ -777,7 +789,7 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Tienda ventas"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
@@ -838,6 +850,7 @@ msgstr ""
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
 msgstr ""
+"¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
 
 #. module: sale
 #: view:sale.order:0
@@ -956,7 +969,7 @@ msgstr "Dirección de envío :"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr ""
+msgstr "Estado borrador del pedido de venta"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
@@ -997,6 +1010,7 @@ msgstr "Confirmar presupuesto"
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
 
 #. module: sale
 #: view:sale.order:0
@@ -1077,6 +1091,9 @@ msgid ""
 "The same sales order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
+"Esta es la lista de facturas que han sido generadas para este pedido de "
+"venta. El mismo pedido de venta puede haber sido facturado varias veces "
+"(línea a línea, por ejemplo)."
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -1086,7 +1103,7 @@ msgstr "Política de facturación"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Fecha en que se crea el pedido de venta."
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
@@ -1145,7 +1162,7 @@ msgstr "¡Error!"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "¡No se puede cancelar el pedido de venta!"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1193,7 +1210,7 @@ msgstr "Ventas"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice From The Picking"
-msgstr ""
+msgstr "Factura desde el albarán"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
@@ -1314,6 +1331,8 @@ msgid ""
 "You have to select a customer in the sales form !\n"
 "Please set one customer before choosing a product."
 msgstr ""
+"¡Debe seleccionar un cliente en el formulario de ventas!\n"
+"Introduzca un cliente antes de seleccionar un producto."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -1323,7 +1342,7 @@ msgstr "Albarán y Orden de entrega"
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Documento origen"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1343,18 +1362,20 @@ msgstr "Documento del movimiento al cliente."
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "El importe sin impuestos."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel all picking attached to this sales order."
 msgstr ""
+"Debe primero cancelar todos los albaranes relacionados con este pedido de "
+"venta."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "Ventas. Anticipo pago factura"
 
 #. module: sale
 #: field:sale.order,incoterm:0
@@ -1488,6 +1509,7 @@ msgstr "Total"
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
+"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1504,7 +1526,7 @@ msgstr ""
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete a sales order line which is %s !"
-msgstr ""
+msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1522,7 +1544,7 @@ msgstr "Para facturar"
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Fecha en la que se confirma el pedido de venta."
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1554,6 +1576,8 @@ msgstr "Excepción de factura"
 msgid ""
 "This is a list of picking that has been generated for this sales order."
 msgstr ""
+"Esta es la lista de albaranes que han sido generados para este pedido de "
+"venta."
 
 #. module: sale
 #: help:sale.installer,sale_margin:0
@@ -1797,7 +1821,7 @@ msgstr "Avanzar factura"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sales order '%s' has been cancelled."
-msgstr ""
+msgstr "El pedido de venta '%s' ha sido cancelado."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1821,12 +1845,12 @@ msgstr ""
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "El importe de los impuestos."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr ""
+msgstr "Albaranes"
 
 #. module: sale
 #: field:sale.config.picking_policy,progress:0
@@ -1883,6 +1907,8 @@ msgstr "¡La factura ha sido creada correctamente!"
 #, python-format
 msgid "You must first cancel all invoices attached to this sales order."
 msgstr ""
+"Primero debe cancelar todas las facturas relacionadas con este pedido de "
+"venta."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1922,6 +1948,8 @@ msgid ""
 "One Procurement order for each sales order line and for each of the "
 "components."
 msgstr ""
+"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
+"uno de los componentes."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -1936,19 +1964,19 @@ msgstr "Fecha pedido"
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Pedido de venta confirmado a factura."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr ""
+msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1984,12 +2012,12 @@ msgstr "Debe asignar un lote de producción para este producto"
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Layout Sequence"
-msgstr ""
+msgstr "Secuencia plantilla"
 
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "Indica que una factura ha sido pagada."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -2056,7 +2084,7 @@ msgstr "Contabilidad"
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "Pasos para entregar un pedido de venta"
 
 #. module: sale
 #: view:sale.order:0
@@ -2067,7 +2095,7 @@ msgstr "Buscar pedido de venta"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sales Order Requisition"
-msgstr ""
+msgstr "Solicitud pedido de venta"
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 75c37ff9416..546e88ce37a 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -38,7 +38,7 @@ class sale_report(osv.osv):
             ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'uom_name': fields.char('Default UoM', size=128, readonly=True),
+        'uom_name': fields.char('Reference UoM', size=128, readonly=True),
         'product_uom_qty': fields.float('# of Qty', readonly=True),
 
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
@@ -47,7 +47,6 @@ class sale_report(osv.osv):
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
         'delay': fields.float('Commitment Delay', digits=(16,2), readonly=True),
-        'price_average': fields.float('Average Price', readonly=True,group_operator="avg"),
         'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'nbr': fields.integer('# of Lines', readonly=True),
         'state': fields.selection([
@@ -90,24 +89,27 @@ class sale_report(osv.osv):
                 sale_order s,
                     (
                     select l.id as id,
-                         l.product_id as product_id,
-                         u.name as uom_name,
-                         sum(l.product_uom_qty * u.factor) as product_uom_qty,
-                         sum(l.product_uom_qty*l.price_unit) as price_total,
-                         (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor)*count(l.product_id))::decimal(16,2) as price_average,
-                         pt.categ_id, l.order_id
+                        l.product_id as product_id,
+                        (case when u.uom_type not in ('reference') then
+                            (select name from product_uom where uom_type='reference' and category_id=u.category_id)
+                        else
+                            u.name
+                        end) as uom_name,
+                        sum(l.product_uom_qty/u.factor) as product_uom_qty,
+                        sum(l.product_uom_qty*l.price_unit) as price_total,
+                        pt.categ_id, l.order_id
                     from
-                     sale_order_line l
-                     left join product_uom u on (u.id=l.product_uom)
-                     left join product_template pt on (pt.id=l.product_id)
-                    group by l.id, l.order_id, l.product_id, u.name, pt.categ_id) el
+                     sale_order_line l ,product_uom u, product_product p, product_template pt
+                     where u.id = l.product_uom
+                     and pt.id = p.product_tmpl_id
+                     and p.id = l.product_id
+                      group by l.id, l.order_id, l.product_id, u.name, pt.categ_id, u.uom_type, u.category_id) el
                 where s.id = el.order_id
                 group by el.id,
                     el.product_id,
                     el.uom_name,
                     el.product_uom_qty,
                     el.price_total,
-                    el.price_average,
                     el.categ_id,
                     el.order_id,
                     s.date_order,
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index a47ab2e73a9..41cdecee0ea 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -23,7 +23,6 @@
                 <field name="product_uom_qty" sum="# of Qty"/>
                 <field name="shipped_qty_1" sum="Shipped Qty"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
-                <field name="price_average" sum="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>
                 <field name="state" invisible="1"/>
@@ -100,7 +99,7 @@
                     <filter string="Partner" icon="terp-partner"  name="Customer" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
-                    <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
+                    <filter string="Reference UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
                     <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
@@ -111,7 +110,7 @@
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
-                   <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
+                   <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
                 </group>
             </search>
@@ -146,11 +145,11 @@
     </record>
 
    <record id="action_sales_by_partner" model="ir.actions.act_window">
-        <field name="name">Sales by Partner</field>
+        <field name="name">Sales per Customer in last 90 days</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
-        <field name="domain">[('state','in',('manual','progress')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
+        <field name="domain">[('state','=','done'),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
         <field name="view_id" ref="view_sales_by_partner_graph"/>
         <field name="context">{'search_default_Customer':1}</field>
     </record>
@@ -168,7 +167,7 @@
     </record>
 
    <record id="action_sales_by_salesman" model="ir.actions.act_window">
-        <field name="name">Sales by Salesman</field>
+        <field name="name">Sales by Salesman in last 90 days</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
@@ -190,7 +189,7 @@
     </record>
 
    <record id="action_sales_product_total_price" model="ir.actions.act_window">
-        <field name="name">Sales by Product's Category</field>
+        <field name="name">Sales by Product's Category in last 90 days</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
@@ -208,6 +207,17 @@
                 <field name="month" />
                 <field name="product_id" />
                 <field name="price_total" />
+                <field name="user_id" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="uom_name" invisible="1"/>
+                <field name="categ_id" invisible="1"/>
+                <field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
+                <field name="state" invisible="1"/>
+                <field name="shop_id" invisible="1"/>
+                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
+                <field name="day" invisible="1"/>
+                <field name="year" invisible="1"/>
+                <field name="date" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -217,7 +227,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="domain">[('state','in',('manual','progress','done')),('year','=', time.strftime('%Y'))]</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':['month','product_id']}</field>
+        <field name="context">{'search_default_order_month':1,'group_by_no_leaf':0,'group_by':['month', 'product_id']}</field>
         <field name="view_id" ref="view_sales_by_month_tree"/>
     </record>
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a789ad287f3..add21f48cb3 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -185,7 +185,7 @@ class sale_order(osv.osv):
         for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
             result[line.order_id.id] = True
         return result.keys()
-
+    
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True,
             readonly=True, states={'draft': [('readonly', False)]}, select=True),
@@ -274,6 +274,9 @@ class sale_order(osv.osv):
         'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and  self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
     }
+    _sql_constraints = [
+        ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
+    ]
     _order = 'name desc'
 
     # Form filling
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c282b38a14b..3d1a14edd53 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -81,7 +81,7 @@
             <field name="type">tree</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <tree string="Sales Orders" colors="grey:state=='done'">
+                <tree string="Sales Orders" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
                     <field name="name"/>
                     <field name="date_order"/>
                     <field name="client_order_ref" groups="base.group_extended"/>
@@ -514,6 +514,7 @@
         context="{'search_default_partner_id': [active_id]}"
         id="act_res_partner_2_sale_order"
         name="Sales"
+        groups="base.group_sale_salesman"
         res_model="sale.order"
         src_model="res.partner"/>
 
@@ -523,7 +524,7 @@
         name="Product sales"
         res_model="sale.order.line"
         src_model="product.product"
-        groups="base.group_extended"/>
+        groups="base.group_sale_salesman"/>
 
         <menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"
             groups="base.group_extended"/>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 923c91fb3aa..a89e1c4578d 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -2,6 +2,7 @@
 "access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,0,0,0
 "access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0
 "access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1
+"access_sale_order_line_accountant","sale.order.line accountant","model_sale_order_line","account.group_account_user",1,1,0,0
 "access_account_invoice_tax_salesman","account_invoice_tax salesman","account.model_account_invoice_tax","base.group_sale_salesman",1,1,1,0
 "access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,0
 "access_account_invoice_manager","account_invoice manager","account.model_account_invoice","base.group_sale_manager",1,1,1,1
@@ -16,13 +17,14 @@
 "access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
 "access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
 "access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,1,1,1
-"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,0,0,0
+"access_sale_order_accountant","sale.order.accountant","model_sale_order","account.group_account_user",1,1,0,0
+"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,1,1,1
 "access_sale_report_salesman","sale.report","model_sale_report","base.group_sale_salesman",1,1,1,0
 "access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1
 "access_ir_property_sales","ir.property.sales","base.model_ir_property","base.group_sale_salesman",1,1,1,1
 "access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0
 "access_res_partner_sale_user","res.partner.sale.user","base.model_res_partner","base.group_sale_salesman",1,0,0,0
-"access_res_partner_sale_manager","res.partner.sale.user","base.model_res_partner","base.group_sale_manager",1,0,0,0
+"access_res_partner_sale_manager","res.partner.sale.manager","base.model_res_partner","base.group_sale_manager",1,1,1,1
 "access_report_stock_move_sales","report.stock.move.sale","stock.model_report_stock_move","base.group_sale_manager",1,1,1,1
 "access_stock_picking_sales","stock.picking.sales","stock.model_stock_picking","base.group_sale_manager",1,1,1,1
 "access_product_template_sale_user","product.template sale use","product.model_product_template","base.group_sale_salesman",1,0,0,0
@@ -53,3 +55,18 @@
 "access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
 "access_sale_shop_sale_user","sale.shop.sale.user","model_sale_shop","base.group_sale_salesman",1,0,0,0
 "access_sale_shop_sale_manager","sale.shop.sale.manager","model_sale_shop","base.group_sale_manager",1,1,1,1
+"access_product_uom_categ_sale_manager","product.uom.categ salemanager","product.model_product_uom_categ","base.group_sale_manager",1,1,1,1
+"access_product_uom_sale_manager","product.uom salemanager","product.model_product_uom","base.group_sale_manager",1,1,1,1
+"access_product_ul_sale_manager","product.ul salemanager","product.model_product_ul","base.group_sale_manager",1,1,1,1
+"access_product_category_sale_manager","product.category salemanager","product.model_product_category","base.group_sale_manager",1,1,1,1
+"access_product_template_sale_manager","product.template salemanager","product.model_product_template","base.group_sale_manager",1,1,1,1
+"access_product_product_sale_manager","product.product salemanager","product.model_product_product","base.group_sale_manager",1,1,1,1
+"access_product_packaging_sale_manager","product.packaging salemanager","product.model_product_packaging","base.group_sale_manager",1,1,1,1
+"access_product_supplierinfo_sale_manager","product.supplierinfo salemanager","product.model_product_supplierinfo","base.group_sale_manager",1,1,1,1
+"access_pricelist_partnerinfo_sale_manager","pricelist.partnerinfo salemanager","product.model_pricelist_partnerinfo","base.group_sale_manager",1,1,1,1
+"access_product_price_type_sale_manager","product.price.type salemanager","product.model_product_price_type","base.group_sale_manager",1,1,1,1
+"access_product_pricelist_type_sale_manager","product.pricelist.type salemanager","product.model_product_pricelist_type","base.group_sale_manager",1,1,1,1
+"access_product_pricelist_sale_manager","product.pricelist salemanager","product.model_product_pricelist","base.group_sale_manager",1,1,1,1
+"access_ir_property_group_sale_manager","ir_property group_sale_manager","base.model_ir_property","base.group_sale_manager",1,1,1,1
+"access_product_group_res_partner_sale_manager","res_partner group_sale_manager","base.model_res_partner","base.group_sale_manager",1,1,1,1
+"access_product_pricelist_version_sale_manager","product.pricelist.version sale_manager","product.model_product_pricelist_version","base.group_sale_manager",1,1,1,1
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index ac4f7573c5a..786b5d2a7ff 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -8,6 +8,9 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
+    <record id="base.group_sale_salesman_all_leads" model="res.groups">
+        <field name="name">Sales / User - See All Leads</field>
+    </record>
 
     <record model="ir.ui.menu" id="base.menu_base_partner">
         <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
@@ -17,19 +20,28 @@
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
 
+    <!-- Multi - Company Rules -->
+
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="name">Sale Order multi-company</field>
         <field name="model_id" ref="model_sale_order"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
-
     <record model="ir.rule" id="sale_order_line_comp_rule">
         <field name="name">Sale Order Line multi-company</field>
         <field name="model_id" ref="model_sale_order_line"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
     </record>
+    <record model="ir.rule" id="sale_order_line_comp_rule">
+        <field name="name">Sale Shop multi-company</field>
+        <field name="model_id" ref="model_sale_shop"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+    <!-- Multi - Salesmen sales order assignation rules -->
 
     <record id="sale_order_personal_rule" model="ir.rule">
         <field name="name">Personal Orders</field>
@@ -37,6 +49,13 @@
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
         <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
+    <record id="sale_order_see_all" model="ir.rule">
+        <field name="name">All Orders</field>
+        <field ref="model_sale_order" name="model_id"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
+    </record>
+
 
     <record id="sale_order_line_personal_rule" model="ir.rule">
         <field name="name">Personal Order Lines</field>
@@ -45,11 +64,11 @@
         <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
-    <record model="ir.rule" id="sale_order_line_comp_rule">
-        <field name="name">Sale Shop multi-company</field>
-        <field name="model_id" ref="model_sale_shop"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
+    <record id="sale_order_line_see_all" model="ir.rule">
+        <field name="name">All Orders Lines</field>
+        <field ref="model_sale_order_line" name="model_id"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
 </data>
diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
index b3c01599680..b4a985ec4e8 100644
--- a/addons/sale/test/advance_invoice.yml
+++ b/addons/sale/test/advance_invoice.yml
@@ -5,7 +5,6 @@
   !record {model: sale.order, id: sale_order_so5}:
     date_order: '2010-07-17'
     invoice_quantity: order
-    name: SO004
     order_line:
       - name: LG Viewty Smart
         price_unit: 170.0
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index de845b5b34d..8c0383acb02 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -110,8 +110,8 @@ class sale_order_line_make_invoice(osv.osv_memory):
         if not invoices:
             raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!'))
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 sale_order_line_make_invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_analytic_plans/i18n/es.po b/addons/sale_analytic_plans/i18n/es.po
index 14a8c34932e..8e8db68ddfe 100644
--- a/addons/sale_analytic_plans/i18n/es.po
+++ b/addons/sale_analytic_plans/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:44+0000\n"
+"PO-Revision-Date: 2010-12-28 09:16+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
@@ -34,11 +34,15 @@ msgid ""
 "    The base module to manage analytic distribution and sales orders.\n"
 "    "
 msgstr ""
+"\n"
+"    El módulo base para gestionar distribuciones analíticas y pedidos de "
+"venta.\n"
+"    "
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index 585f4feb2dd..a5a264e2a67 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-22 08:03+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 09:07+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -65,6 +66,19 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo añade un acceso directo a uno o varios casos de oportunidades en "
+"el CRM.\n"
+"Este acceso directo le permite generar un pedido de venta a partir del caso "
+"seleccionado.\n"
+"Si están abiertos distintos casos (una lista), genera un pedido de venta "
+"por\n"
+"caso.\n"
+"El caso se cierra y es enlazado al pedido ventas generado.\n"
+"\n"
+"Le sugerimos que instale este módulo si ha instalado ambos módulos sale y "
+"crm.\n"
+"    "
 
 #. module: sale_crm
 #: view:crm.make.sale:0
diff --git a/addons/sale_crm/i18n/pl.po b/addons/sale_crm/i18n/pl.po
index 97f2efd23c0..bff8a218494 100644
--- a/addons/sale_crm/i18n/pl.po
+++ b/addons/sale_crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-08-03 06:19+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 07:48+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -24,30 +24,30 @@ msgstr "Klient"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr ""
+msgstr "Konwertuj do oferty"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "is converted to Quotation."
-msgstr ""
+msgstr "skonwertowano do oferty."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Zbyt mało danych!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "Nie zdefiniowano adresu klienta!"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr ""
+msgstr "Wykonaj sprzedaż"
 
 #. module: sale_crm
 #: model:ir.module.module,description:sale_crm.module_meta_information
@@ -65,17 +65,28 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Ten moduł dodaje skrót na jednym lub wielu szansach CRM.\n"
+"Ten skrót pozwala generować zamówienie sprzedaży na \n"
+"podstawie wybranych spraw. Jeśli różne sprawy zostały \n"
+"otwarte (lista), to generowane jest jedno zamówienie sprzedaży \n"
+"za każdą sprawę. Sprawa jest zamykana i łączona z \n"
+"wygenerowanym zamówieniem sprzedaży.\n"
+"\n"
+"Sugerujemy zainstalowanie tego modułu, jeśli zainstalowałeś \n"
+"Sprzedaż i CRM.\n"
+"    "
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "_Create"
-msgstr ""
+msgstr "_Utwórz"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
-msgstr ""
+msgstr "Zaznacz to, aby zamknąć szansę po utworzeniu zamówienia."
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -86,35 +97,35 @@ msgstr "Konwertuj do oferty"
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Miesięczny obrót"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "Skonwertowano do oferty(id: %s)."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Opportunity "
-msgstr ""
+msgstr "Szansa "
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Opportunity: %s"
-msgstr ""
+msgstr "Szansa: %s"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Tworzy zamówienie sprzedaży z Szansy"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "Oferty"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
@@ -124,23 +135,23 @@ msgstr "Sklep"
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Szanse wg etapów"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr ""
+msgstr "Moje oferty"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr ""
+msgstr "Zamknij szansę"
 
 #. module: sale_crm
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Zespół sprzedaży"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -155,7 +166,7 @@ msgstr "Anuluj"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Zamówienie sprzedaży"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index cdb5893a6f3..3c17f278e16 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -112,7 +112,7 @@ class crm_make_sale(osv.osv_memory):
             if make.close:
                 case_obj.case_close(cr, uid, data)
             if not new_ids:
-                return {}
+                return {'type': 'ir.actions.act_window_close'}
             if len(new_ids)<=1:
                 value = {
                     'domain': str([('id', 'in', new_ids)]),
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index b6c0da123f4..c16e9206950 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:50+0000\n"
+"PO-Revision-Date: 2010-12-28 08:48+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -30,7 +30,7 @@ msgstr "El tipo de diario utilizado para ventas y albaranes."
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -99,6 +99,32 @@ msgid ""
 "    Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"    El módulo de diario de ventas le permite categorizar sus ventas\n"
+"    y entregas (albaranes) en diferentes diarios.\n"
+"    Este módulo es muy útil para compañías grandes que\n"
+"    trabajan por departamentos.\n"
+"\n"
+"    Puede usar los diarios para diferentes propósitos, algunos ejemplos:\n"
+"    * aislar ventas de diferentes departamentos\n"
+"    * diarios para entregas según camión o compañía de envío\n"
+"\n"
+"    Los diarios tienen un responsable y evolucionan entre diferentes "
+"estados:\n"
+"    * borrador, abierto, cancelado, hecho.\n"
+"\n"
+"    Se pueden procesar operaciones en lote en los diferentes diarios\n"
+"    para confirmar todas las ventas a la vez, para validar o facturar "
+"albaranes, ...\n"
+"\n"
+"    También soporta métodos de facturación en lote que pueden ser "
+"configurados \n"
+"    según tercero o órdenes de venta, ejemplos:\n"
+"    * facturación diaria,\n"
+"    * facturación mensual, ...\n"
+"\n"
+"    Se proporcionan algunas estadísticas por diario.\n"
+"    "
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
diff --git a/addons/sale_layout/__init__.py b/addons/sale_layout/__init__.py
index e0a5a2b9f9c..e0a5a2b9f9c 100755..100644
--- a/addons/sale_layout/__init__.py
+++ b/addons/sale_layout/__init__.py
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index f8db8d5d868..f8db8d5d868 100755..100644
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
diff --git a/addons/sale_layout/i18n/es.po b/addons/sale_layout/i18n/es.po
index 298210c9e48..a3668701555 100644
--- a/addons/sale_layout/i18n/es.po
+++ b/addons/sale_layout/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-21 15:08+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 09:13+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\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-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_layout
@@ -35,6 +36,16 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo proporciona funcionalidades para mejorar la plantilla del "
+"pedido de ventas.\n"
+"\n"
+"    Proporciona la posibilidad de\n"
+"        * ordenar todas las líneas de un pedido de ventas\n"
+"        * añadir títulos, líneas de comentario, líneas con subtotales\n"
+"        * dibujar líneas horizontales y poner saltos de página\n"
+"\n"
+"    "
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -264,7 +275,7 @@ msgstr "Fax:"
 #. module: sale_layout
 #: model:ir.model,name:sale_layout.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -279,7 +290,7 @@ msgstr "Precio"
 #. module: sale_layout
 #: model:ir.model,name:sale_layout.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
 
 #. module: sale_layout
 #: view:sale.order:0
diff --git a/addons/sale_layout/i18n/fr_BE.po b/addons/sale_layout/i18n/fr_BE.po
index 52da36456b6..52da36456b6 100755..100644
--- a/addons/sale_layout/i18n/fr_BE.po
+++ b/addons/sale_layout/i18n/fr_BE.po
diff --git a/addons/sale_layout/i18n/fr_FR.po b/addons/sale_layout/i18n/fr_FR.po
index 349a32e2c84..349a32e2c84 100755..100644
--- a/addons/sale_layout/i18n/fr_FR.po
+++ b/addons/sale_layout/i18n/fr_FR.po
diff --git a/addons/sale_layout/report/__init__.py b/addons/sale_layout/report/__init__.py
index 21b30a51454..21b30a51454 100755..100644
--- a/addons/sale_layout/report/__init__.py
+++ b/addons/sale_layout/report/__init__.py
diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py
index 94b10c8ebf9..57839ecffeb 100755..100644
--- a/addons/sale_layout/report/report_sale_layout.py
+++ b/addons/sale_layout/report/report_sale_layout.py
@@ -41,7 +41,6 @@ class sale_order_1(report_sxw.rml_parse):
     def sale_order_lines(self, sale_order):
         result = []
         sub_total = {}
-        info = []
         order_lines = []
         res = {}
         obj_order_line = self.pool.get('sale.order.line')
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index fd9cbe90bf8..fd9cbe90bf8 100755..100644
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
diff --git a/addons/sale_layout/sale_layout_report.xml b/addons/sale_layout/sale_layout_report.xml
index 53775fdb149..53775fdb149 100755..100644
--- a/addons/sale_layout/sale_layout_report.xml
+++ b/addons/sale_layout/sale_layout_report.xml
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index af901928037..af901928037 100755..100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
diff --git a/addons/sale_margin/i18n/es.po b/addons/sale_margin/i18n/es.po
index 040b2336991..648d2dfba67 100644
--- a/addons/sale_margin/i18n/es.po
+++ b/addons/sale_margin/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 11:26+0000\n"
+"PO-Revision-Date: 2010-12-28 08:37+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -63,6 +63,11 @@ msgid ""
 "Unit Price and Cost Price\n"
 "    "
 msgstr ""
+" \n"
+"    Este módulo añade el 'Margen' en el pedido de venta,\n"
+"    que proporciona la rentabilidad calculando la diferencia entre el precio "
+"unidad y el precio de coste\n"
+"    "
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
@@ -86,6 +91,8 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and Cost Price."
 msgstr ""
+"Proporciona la rentabilidad calculando la diferencia entre el precio unidad "
+"y el precio de coste."
 
 #. module: sale_margin
 #: field:report.account.invoice.product,type:0
@@ -321,7 +328,7 @@ msgstr "Empresa"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
 
 #. module: sale_margin
 #: selection:report.account.invoice.product,state:0
@@ -336,7 +343,7 @@ msgstr "Análisis de facturas"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 97fd3b29cef..f7bbf41e5d3 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -29,9 +29,12 @@ class sale_order_line(osv.osv):
         res = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty=qty,
             uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
             lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag)
+        frm_cur = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
+        to_cur = self.pool.get('res.partner').browse(cr, uid, partner_id).property_product_pricelist.currency_id.id
         if product:
             purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price
-            res['value'].update({'purchase_price': purchase_price})
+            price = self.pool.get('res.currency').compute(cr, uid, frm_cur, to_cur, purchase_price, round=False)
+            res['value'].update({'purchase_price': price})
         return res
 
     def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
diff --git a/addons/sale_mrp/i18n/es.po b/addons/sale_mrp/i18n/es.po
index ceda6215846..3cd6a13450d 100644
--- a/addons/sale_mrp/i18n/es.po
+++ b/addons/sale_mrp/i18n/es.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 11:39+0000\n"
+"PO-Revision-Date: 2010-12-28 07:51+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
 msgid "Indicate the Customer Reference from sales order."
-msgstr ""
+msgstr "Indica la referencia del cliente del pedido de venta."
 
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sales Reference"
-msgstr ""
+msgstr "Referencia venta"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
@@ -45,11 +45,19 @@ msgid ""
 "    It adds sales name and sales Reference on production order\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo proporciona facilidades al usuario para instalar los módulos "
+"mrp y sale\n"
+"    a la vez. Se utiliza básicamente cuando queremos hacer un seguimiento de "
+"las\n"
+"    órdenes de producción generadas a partir del pedido de cliente.\n"
+"    Añade el nombre y la referencia de la venta en la orden de producción.\n"
+"    "
 
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sales Name"
-msgstr ""
+msgstr "Nombre venta"
 
 #. module: sale_mrp
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
@@ -64,7 +72,7 @@ msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
-msgstr ""
+msgstr "Indica el nombre del pedido de venta."
 
 #~ msgid "Indicate the name of sale order."
 #~ msgstr "Indica el nombre del pedido de venta."
diff --git a/addons/sale_mrp/i18n/pl.po b/addons/sale_mrp/i18n/pl.po
index 94efe403fa9..1c24876198f 100644
--- a/addons/sale_mrp/i18n/pl.po
+++ b/addons/sale_mrp/i18n/pl.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-08-03 03:52+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 08:37+0000\n"
+"Last-Translator: OpenERP Administrators <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-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
 msgid "Indicate the Customer Reference from sales order."
-msgstr ""
+msgstr "Wskazuje odnośnik klienta z zamówienia sprzedaży."
 
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sales Reference"
-msgstr ""
+msgstr "Odnośnik sprzedaży"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
@@ -44,11 +44,18 @@ msgid ""
 "    It adds sales name and sales Reference on production order\n"
 "    "
 msgstr ""
+"\n"
+"    Ten moduł wzbogaca instalację modułu mrp i sprzedaży.\n"
+"    Jest stosowany, kiedy chcesz śledzić zamówienia produkcji\n"
+"    powstałe z zamówienia sprzedaży.\n"
+"    Moduł dodaje nazwę i odnośnik sprzedaży na zamówieniu \n"
+"    produkcji.\n"
+"    "
 
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sales Name"
-msgstr ""
+msgstr "Nazwa sprzedaży"
 
 #. module: sale_mrp
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
@@ -58,12 +65,12 @@ msgstr "Zarządzanie sprzedażą i MRP"
 #. module: sale_mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Zamawiana ilośc nie może być  ujemna lub zerowa !"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
-msgstr ""
+msgstr "Wskazuje nazwę zamówienia sprzedaży."
 
 #~ msgid "Indicate the name of sale order."
 #~ msgstr "Określ nazwę zamówienia sprzedaży"
diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv
index 90ff5ac06e2..a504c9a9e5a 100644
--- a/addons/sale_mrp/security/ir.model.access.csv
+++ b/addons/sale_mrp/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_mrp_bom_user","mrp.bom","mrp.model_mrp_bom","base.group_sale_salesman",1,0,0,0
 "access_mrp_bom_manager","mrp.bom","mrp.model_mrp_bom","base.group_sale_manager",1,0,0,0
+"access_sale_order_manufacturing_user","sale.order manufacturing.user","sale.model_sale_order","mrp.group_mrp_user",1,1,0,0
+"access_sale_order_line_manufacturing_user","sale.order.line manufacturing.user","sale.model_sale_order_line","mrp.group_mrp_user",1,1,0,0
diff --git a/addons/sale_order_dates/i18n/es.po b/addons/sale_order_dates/i18n/es.po
index 581b033f126..9428e379266 100644
--- a/addons/sale_order_dates/i18n/es.po
+++ b/addons/sale_order_dates/i18n/es.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:43+0000\n"
+"PO-Revision-Date: 2010-12-28 09:14+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
 msgid "Date on which customer has requested for sales."
-msgstr ""
+msgstr "Fecha en que el cliente ha solicitado la venta."
 
 #. module: sale_order_dates
 #: field:sale.order,commitment_date:0
@@ -36,12 +36,12 @@ msgstr "Fecha efectiva"
 #. module: sale_order_dates
 #: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "Fechas en pedidos de venta"
 
 #. module: sale_order_dates
 #: help:sale.order,effective_date:0
 msgid "Date on which picking is created."
-msgstr ""
+msgstr "Fecha en que el albarán ha sido creado."
 
 #. module: sale_order_dates
 #: field:sale.order,requested_date:0
@@ -51,7 +51,7 @@ msgstr "Fecha solicitud"
 #. module: sale_order_dates
 #: model:ir.model,name:sale_order_dates.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
 
 #. module: sale_order_dates
 #: model:ir.module.module,description:sale_order_dates.module_meta_information
@@ -59,11 +59,14 @@ msgid ""
 "\n"
 "Add commitment, requested and effective dates on the sales order.\n"
 msgstr ""
+"\n"
+"Añade las fechas de compromiso, solicitada y efectiva en el pedido de "
+"venta.\n"
 
 #. module: sale_order_dates
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
-msgstr ""
+msgstr "Fecha en que la entrega de productos se va a realizar."
 
 #~ msgid "Sale Order"
 #~ msgstr "Pedido venta"
diff --git a/addons/sale_order_dates/i18n/pl.po b/addons/sale_order_dates/i18n/pl.po
new file mode 100644
index 00000000000..7e3d2d2e402
--- /dev/null
+++ b/addons/sale_order_dates/i18n/pl.po
@@ -0,0 +1,67 @@
+# 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: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2010-12-28 09:08+0000\n"
+"Last-Translator: OpenERP Administrators <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-12-29 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "Data, na którą klient zamówił produkty."
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Data dostawy"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Data realizacji"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Daty zamówienia sprzedaży"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Data utworzenia dostawy"
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Spodziewana data"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Zamówienie sprzedaży"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+"\n"
+"Dodaje daty dostawy, spodziewaną i realizacji na zamówieniu sprzedaży.\n"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Data, w której dostawa powinna zostać dokonana."
diff --git a/addons/share/i18n/es.po b/addons/share/i18n/es.po
new file mode 100644
index 00000000000..1617c61d628
--- /dev/null
+++ b/addons/share/i18n/es.po
@@ -0,0 +1,475 @@
+# Spanish 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: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2010-12-28 09:08+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-29 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:0
+#, python-format
+msgid "Sharing"
+msgstr "Compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr ""
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "(Copy for sharing)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "%s (Shared)"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr ""
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "User already exists"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Database"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+"    %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/web/editors.py:0
+#, python-format
+msgid "Share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+#: field:share.wizard.user,share_wizard_id:0
+msgid "Share Wizard"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "*usual password*"
+msgstr ""
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 6c8f923af24..0d871db5ab0 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 11:09+0000\n"
+"PO-Revision-Date: 2010-12-28 08:42+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #~ msgid "Stock Management"
@@ -826,7 +826,7 @@ msgstr "Ubicación de tránsito para transferencias inter-compañías"
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr ""
+msgstr "Cambiar cantidad producto"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -1395,7 +1395,7 @@ msgstr "Proveedores TI genéricos"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr ""
+msgstr "Albarán:"
 
 #. module: stock
 #: field:stock.inventory,date:0
@@ -2104,7 +2104,7 @@ msgstr "Gestión de almacenes"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Entrega parcial"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -2679,6 +2679,7 @@ msgstr ""
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr ""
+"¡No se puede consumir un movimiento con una cantidad negativa o cero!"
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -2742,6 +2743,8 @@ msgstr "Cantidad (UdV)"
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
 msgstr ""
+"Está moviendo %.2f %s productos pero sólo está disponible %.2f %s en este "
+"lote."
 
 #. module: stock
 #: view:stock.move:0
@@ -3224,7 +3227,7 @@ msgstr "Motivo"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Delivery Order:"
-msgstr ""
+msgstr "Orden de entrega:"
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3378,12 +3381,12 @@ msgstr "Fusionar inventarios"
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
-msgstr ""
+msgstr "Esta cantidad está expresada en la UdM por defecto del producto."
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr ""
+msgstr "Recepción:"
 
 #. module: stock
 #: help:stock.location,scrap_location:0
@@ -3827,7 +3830,7 @@ msgstr "Fichero XML"
 #. module: stock
 #: view:stock.change.product.qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Seleccionar cantidad"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 9717f646664..d1274f31f3e 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-29 07:27+0000\n"
+"PO-Revision-Date: 2010-12-28 09:03+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -30,7 +30,7 @@ msgstr ""
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Variation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "Nie zdefiniowano konta wyceny dla kategorii produktu: %s"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -866,7 +866,7 @@ msgstr "Zaplanowana data"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr "Wyzzukiwanie pobrań"
+msgstr "Wyszukiwanie pobrań"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -1202,6 +1202,10 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
+"Dzienniki magazynowe pozwalają powiązać każda operację magazynową do "
+"konkretnego dziennika w zależności od typu operacji lub osób wykonujących "
+"operację. Przykłady dzienników magazynowych, to kontrola jakości, listy "
+"pobrań, pakowanie itp."
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1577,7 +1581,7 @@ msgstr "Przesunięcia zapasów"
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
-msgstr "Wysyłanie towarów"
+msgstr "Wydania zewnętrzne"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1631,7 +1635,7 @@ msgstr "Raport zapasów wg partii magazynowych"
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Delivered Qty"
-msgstr "Ilość dostarczona"
+msgstr "Ilość bieżąca"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line
@@ -1872,7 +1876,7 @@ msgstr "Brak konta przyjęć dla produktu lub jego kategorii: \"%s\" (id: %d)"
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Received Qty"
-msgstr "Otrzymana ilość"
+msgstr "Ilość bieżąca"
 
 #. module: stock
 #: field:stock.production.lot,ref:0
@@ -1959,7 +1963,7 @@ msgstr ""
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr ""
+msgstr "Logistyczna jednostka magazynowa: paleta, kontener, karton..."
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -2189,12 +2193,12 @@ msgstr "Konsola magazynu"
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Future Qty"
-msgstr "Przyszła ilość"
+msgstr "Ilość planowana"
 
 #. module: stock
 #: field:product.category,property_stock_variation:0
 msgid "Stock Variation Account"
-msgstr "Konto odchyleń zapasów"
+msgstr "Konto wyceny zapasów"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2289,7 +2293,7 @@ msgstr "Spodziewana data wykonania pobrania"
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "P&L Qty"
-msgstr "Ilość Zysk/Strata"
+msgstr "Ilość bieżąca"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -2311,6 +2315,11 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
+"Jeśli bieżąca wycena jest włączona dla produktu, to system będzie "
+"automatycznie dokonywał zapisów księgowych dla przesunięć zapasów. Konto "
+"wyceny zapasów ustawiane w kategorii produktów reprezentuje bieżącą wartość, "
+"a konta zapasów wchodzących i wychodzących są kontami przeciwstawnymi dla "
+"niego."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2523,6 +2532,8 @@ msgstr "Data wykonania"
 msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
+"Odznaczając pole aktywności możesz ukryć pobranie bez konieczności usuwania "
+"go."
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -3016,7 +3027,7 @@ msgstr "Partie"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "New pack"
-msgstr ""
+msgstr "Nowe pobranie"
 
 #. module: stock
 #: view:stock.move:0
@@ -3067,7 +3078,7 @@ msgstr "Suma przyjmowanych ilości"
 #. module: stock
 #: field:report.stock.move,product_qty_out:0
 msgid "Out Qty"
-msgstr ""
+msgstr "Ilość wydawana"
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
@@ -3084,7 +3095,7 @@ msgstr "Wiadomość !"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in current pack"
-msgstr ""
+msgstr "Wstaw do bieżącego pobrania"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3142,7 +3153,7 @@ msgstr "Błąd!"
 msgid ""
 "There is no inventory variation account defined on the product category: "
 "\"%s\" (id: %d)"
-msgstr ""
+msgstr "Brak definicji konta wyceny dla kategorii produktu: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -3167,6 +3178,7 @@ msgstr "Typ związanej strefy"
 #: help:stock.picking,move_type:0
 msgid "It specifies goods to be delivered all at once or by direct delivery"
 msgstr ""
+"To określa, że produkty mają być wydawane wszystkie naraz lub bezpośrednio."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
@@ -3179,7 +3191,7 @@ msgstr ""
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr "Przyjęcie towarów"
+msgstr "Przyjęcia zewnętrzne"
 
 #. module: stock
 #: help:stock.location,chained_location_type:0
@@ -3260,6 +3272,8 @@ msgstr ""
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
+"Zaznacz tę opcję, aby ta strefa mogła zawierać uszkodzone/wybrakowane "
+"produkty."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
@@ -3312,7 +3326,7 @@ msgstr ""
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to leave in the current pack"
-msgstr ""
+msgstr "Ilość do zostawienia w bieżącym pobraniu"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3327,6 +3341,8 @@ msgid ""
 "get the up-stream or down-stream traceability of the products contained in "
 "the pack."
 msgstr ""
+"To jest lista pobrań. Wybierając pobranie możesz sprawdzić przepływ "
+"produktów z pobrania wstecz i wprzód."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -3354,6 +3370,11 @@ msgid ""
 "If cost price is decreased, stock variation account will be creadited and "
 "stock input account will be debited."
 msgstr ""
+"jeśli cena kosztowa zostanie zwiększona, to konto wyceny będzie zapisane po "
+"stronie Winien, a konto zapasów wychodzących po stronie Ma wartością = "
+"(różnica wartości * ilość bieżąca).\n"
+"Jeśli cena kosztowa jest zmniejszana, to konto wyceny będzie zapisane po "
+"stronie Ma a konto zapasów wchodzących po stronie Winien."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
@@ -3609,7 +3630,7 @@ msgstr "Nie zdefiniowano dziennika w kategorii produktu: \"%s\" (id: %d)"
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Unplanned Qty"
-msgstr "Ilość nieplanowana"
+msgstr "Ilość bieżąca"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -3742,7 +3763,7 @@ msgstr "Strefa docelowa"
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
-msgstr ""
+msgstr "To określa atrybuty pakowania jak typ, ilość w paczce itp."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -3836,7 +3857,7 @@ msgstr ""
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Produced Qty"
-msgstr "Ilość wyprodukowana"
+msgstr "Ilość bieżąca"
 
 #. module: stock
 #: field:product.category,property_stock_account_output_categ:0
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 05b2f83c15b..dca180baeec 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -106,7 +106,7 @@
                         <separator string="Stocks" colspan="4"/>
                         <field name="qty_available"/>
                         <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                            type="action" icon="gtk-execute" groups = "stock.group_stock_manager,product.group_product_manager"/>
+                            type="action" icon="gtk-execute" groups = "stock.group_stock_manager,base.group_sale_manager,purchase.group_purchase_manager,stock.group_stock_manager,mrp.group_mrp_manager"/>
                         <newline/>
                         <field name="virtual_available"/>
                     </group>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 094b6d43e57..25abf4d7333 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -243,7 +243,9 @@
         <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="help">Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company  activities.</field>
     </record>
-    <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4" groups="base.group_user"/>
+    <menuitem action="action_stock_inventory_report"
+        id="menu_action_stock_inventory_report" 
+        parent="next_id_61" sequence="4"/>
 
 
 </data>
diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
index d7bbc2cbd2a..d7bbc2cbd2a 100755..100644
--- a/addons/stock/report/stock_inventory_move.rml
+++ b/addons/stock/report/stock_inventory_move.rml
diff --git a/addons/stock/report/stock_inventory_move_report.py b/addons/stock/report/stock_inventory_move_report.py
index e8c0d44bcc1..e8c0d44bcc1 100755..100644
--- a/addons/stock/report/stock_inventory_move_report.py
+++ b/addons/stock/report/stock_inventory_move_report.py
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index a2234521218..8c7c53ed8ba 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -9,6 +9,7 @@
 "access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
 "access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1
 "access_stock_tracking_manager","stock.tracking manager","model_stock_tracking","stock.group_stock_manager",1,0,0,0
+"access_stock_tracking_sales_user","stock.tracking sales.user","model_stock_tracking","base.group_sale_salesman",1,1,1,0
 "access_stock_picking_user","stock.picking user","model_stock_picking","stock.group_stock_user",1,1,1,1
 "access_stock_picking_manager","stock.picking manager","model_stock_picking","stock.group_stock_manager",1,1,0,0
 "access_stock_production_lot_manager","stock.production.lot manager","model_stock_production_lot","stock.group_stock_manager",1,0,0,0
@@ -21,7 +22,8 @@
 "access_stock_inventory_line_user","stock.inventory.line user","model_stock_inventory_line","stock.group_stock_user",1,1,1,1
 "access_stock_inventory_line_manager","stock.inventory.line manager","model_stock_inventory_line","stock.group_stock_manager",1,0,0,0
 "access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0
-"access_stock_location_product_manager","stock.location product manager","model_stock_location","product.group_product_manager",1,0,0,0
+"access_stock_location_sale_manager","stock.location sale manager","model_stock_location","base.group_sale_manager",1,0,0,0
+"access_stock_location_stock_manager","stock.location stock manager","model_stock_location","stock.group_stock_manager",1,0,0,0
 "access_stock_lines_date_user","report.stock.lines.date user","model_report_stock_lines_date","stock.group_stock_user",1,0,0,0
 "access_stock_lines_date_manager","report.stock.lines.date manager","model_report_stock_lines_date","stock.group_stock_manager",1,1,1,1
 "access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
@@ -38,3 +40,22 @@
 "access_account_invoice_tax_user","account.invoice.tax stock user","account.model_account_invoice_tax","stock.group_stock_user",1,1,1,0
 "access_account_journal_user","account.journal stock user","account.model_account_journal","stock.group_stock_user",1,0,0,0
 "access_account_fiscalyear","account.fiscalyear stock user","account.model_account_fiscalyear","stock.group_stock_user",1,0,0,0
+"access_product_pricelist_item_sale_manager","product.pricelist.item salemanager","product.model_product_pricelist_item","base.group_sale_manager",1,1,1,1
+"access_product_uom_categ_stock_manager","product.uom.categ stock_manager","product.model_product_uom_categ","stock.group_stock_manager",1,1,1,1
+"access_product_uom_stock_manager","product.uom stock_manager","product.model_product_uom","stock.group_stock_manager",1,1,1,1
+"access_product_ul_stock_manager","product.ul stock_manager","product.model_product_ul","stock.group_stock_manager",1,1,1,1
+"access_product_category_stock_manager","product.category stock_manager","product.model_product_category","stock.group_stock_manager",1,1,1,1
+"access_product_template_stock_manager","product.template stock_manager","product.model_product_template","stock.group_stock_manager",1,1,1,1
+"access_product_product_stock_manager","product.product stock_manager","product.model_product_product","stock.group_stock_manager",1,1,1,1
+"access_product_packaging_stock_manager","product.packaging stock_manager","product.model_product_packaging","stock.group_stock_manager",1,1,1,1
+"access_product_supplierinfo_stock_manager","product.supplierinfo stock_manager","product.model_product_supplierinfo","stock.group_stock_manager",1,1,1,1
+"access_pricelist_partnerinfo_stock_manager","pricelist.partnerinfo stock_manager","product.model_pricelist_partnerinfo","stock.group_stock_manager",1,1,1,1
+"access_product_price_type_stock_manager","product.price.type stock_manager","product.model_product_price_type","stock.group_stock_manager",1,1,1,1
+"access_product_pricelist_type_stock_manager","product.pricelist.type stock_manager","product.model_product_pricelist_type","stock.group_stock_manager",1,1,1,1
+"access_product_pricelist_stock_manager","product.pricelist stock_manager","product.model_product_pricelist","stock.group_stock_manager",1,1,1,1
+"access_ir_property_group_stock_manager","ir_property group_stock_manager","base.model_ir_property","stock.group_stock_manager",1,1,1,1
+"access_product_group_res_partner_stock_manager","res_partner group_stock_manager","base.model_res_partner","stock.group_stock_manager",1,1,1,1
+"access_product_pricelist_version_stock_manager","product.pricelist.version stock_manager","product.model_product_pricelist_version","stock.group_stock_manager",1,1,1,1
+"access_product_pricelist_item_stock_manager","product.pricelist.item stock_manager","product.model_product_pricelist_item","stock.group_stock_manager",1,1,1,1
+"access_account_account_stock_manager","account.account stock manager","account.model_account_account","stock.group_stock_manager",1,0,0,0
+"access_account_journal_stock_manager","account.journal stock manager","account.model_account_journal","stock.group_stock_manager",1,0,0,0
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ececf425e66..8c08041678c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -11,7 +11,7 @@
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
-        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager"/>
+        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
@@ -231,7 +231,7 @@
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
-            groups="base.group_extended,group_stock_user"
+            groups="base.group_extended"
             parent="menu_traceability"/>
 
         <record id="lot_line_tree" model="ir.ui.view">
@@ -389,7 +389,7 @@
             <field name="context">{'full':'1',"search_default_available":1}</field>
             <field name="help">This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot.</field>
         </record>
-        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="group_stock_user,group_stock_manager,base.group_extended"/>
+        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="base.group_extended"/>
 
         #
         # Lot composition (history)
@@ -529,7 +529,7 @@
             <field name="context">{'full':1, 'search_default_in_location':1}</field>
             <field name="help">Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations.</field>
         </record>
-        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="group_stock_manager"/>
+        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config"/>
 
         <record id="view_location_tree" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
@@ -551,7 +551,10 @@
             <field name="view_id" ref="view_location_tree"/>
             <field name="help">This is the structure of your company's warehouses and locations. You can click on a location to get the list of the products and their stock level in this particular location and all its children.</field>
         </record>
-        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended,group_stock_manager" sequence="20"/>
+        <menuitem action="action_location_tree"
+            id="menu_action_location_tree"
+            parent="menu_stock_inventory_control"
+            sequence="20"/>
 
         <record id="view_warehouse" model="ir.ui.view">
             <field name="name">stock.warehouse</field>
@@ -591,7 +594,7 @@
             <field name="view_id" ref="view_warehouse_tree"/>
             <field name="help">Create and manage your warehouses and assign them a location from here</field>
         </record>
-        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="group_stock_manager"/>
+        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config"/>
 
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
@@ -620,7 +623,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="action_process" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="action_process" states="confirmed,assigned" groups="stock.group_stock_user" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -746,7 +749,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
+                                <button name="action_process" states="assigned" string="Process"  groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
                                 <button states="done" name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" />
                             </group>
                         </page>
@@ -1443,7 +1446,7 @@
                         <field name="date"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="4" col="8">
+                    <group expand="0" string="Extended Filters..." colspan="4" col="8" groups="base.group_extended">
                             <field name="origin"/>
                             <field name="picking_id"/>
                             <field name="prodlot_id"/>
@@ -1451,7 +1454,7 @@
                             <field name="state"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
                         <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Picking" name="groupby_picking_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'picking_id'}"/>
                         <filter string="Lot" name="groupby_prodlot_id" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'prodlot_id'}"/>
@@ -1642,7 +1645,7 @@
                        <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
@@ -1677,7 +1680,7 @@
                        <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="8">
+                    <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
@@ -1898,7 +1901,7 @@
         <menuitem
             action="action_stock_journal_form"
             id="menu_action_stock_journal_form"
-            groups="group_stock_manager,base.group_extended"
+            groups="base.group_extended"
             parent="menu_warehouse_config" />
 
     </data>
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index f6bcd60ad5e..41acade696a 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report
+  In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(children) report
 -
   !python {model: stock.location}: |
     import netsvc, tools, os
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 198b067ac79..d6b7355bb7c 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -113,6 +113,6 @@ class change_standard_price(osv.osv_memory):
             'stock_journal' : res[0].stock_journal.id
         }
         prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 change_standard_price()
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 8b686cbb619..afb1299fe2b 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -66,7 +66,7 @@ class stock_fill_inventory(osv.osv_memory):
         if ids and len(ids): 
             ids = ids[0]
         else:
-             return {}    
+             return {'type': 'ir.actions.act_window_close'}    
         fill_inventory = self.browse(cr, uid, ids, context=context)
         res = {}
         res_location = {}
@@ -113,7 +113,7 @@ class stock_fill_inventory(osv.osv_memory):
 
         if(len(product_ids) == 0):
             raise osv.except_osv(_('Message !'), _('No product in this location.'))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_fill_inventory()
 
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index f5ca234d66f..8109d75c515 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -84,7 +84,7 @@ class stock_inventory_merge(osv.osv_memory):
                     'product_qty': quantity,
                 })
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_inventory_merge()
 
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index d43b03b1c5a..8cfdc648349 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -46,7 +46,7 @@ class stock_move_track(osv.osv_memory):
         datas = self.read(cr, uid, ids)[0]
         move_obj = self.pool.get('stock.move')
         move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_move_track()
 
@@ -102,7 +102,7 @@ class stock_move_consume(osv.osv_memory):
             move_obj.action_consume(cr, uid, move_ids,
                              data['product_qty'], data['location_id'],
                              context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_move_consume()
 
@@ -163,7 +163,7 @@ class stock_move_scrap(osv.osv_memory):
             move_obj.action_scrap(cr, uid, move_ids,
                              data['product_qty'], data['location_id'],
                              context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_move_scrap()
 
@@ -218,7 +218,7 @@ class split_in_production_lot(osv.osv_memory):
         if context is None:
             context = {}
         self.split(cr, uid, ids, context.get('active_ids'), context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def split(self, cr, uid, ids, move_ids, context=None):
         """ To split stock moves into production lot
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index b982a4023ef..4543f8a4306 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -190,11 +190,8 @@ class stock_partial_move(osv.osv_memory):
         
         p_moves = {}
         picking_type = self.__get_picking_type(cr, uid, move_ids)
-        print picking_type
+        
         moves_list = picking_type == 'product_moves_in' and partial.product_moves_in  or partial.product_moves_out
-        print picking_type == 'product_moves_in'
-        print partial.product_moves_out
-        print moves_list
         for product_move in moves_list:
             p_moves[product_move.move_id.id] = product_move
             
@@ -204,11 +201,6 @@ class stock_partial_move(osv.osv_memory):
                 continue
             if not p_moves.get(move.id):
                 continue
-            
-            print p_moves[move.id].product_id.id
-            print p_moves[move.id].quantity
-            print p_moves[move.id].product_uom.id
-            
             partial_datas['move%s' % (move.id)] = {
                 'product_id' : p_moves[move.id].id,
                 'product_qty' : p_moves[move.id].quantity,
@@ -224,9 +216,8 @@ class stock_partial_move(osv.osv_memory):
                 })
                 
             
-        print partial_datas
         move_obj.do_partial(cr, uid, moves_ids_final, partial_datas, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_partial_move()
 stock_partial_move_memory_out()
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index ad75c142a96..b657e6639f5 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -174,7 +174,7 @@ class stock_partial_picking(osv.osv_memory):
                                                     'product_currency': p_moves[move.id].currency.id,
                                                     })
         pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
         
    
diff --git a/addons/stock/wizard/stock_split_move.py b/addons/stock/wizard/stock_split_move.py
index 276133b3a01..aa7e4c17e15 100644
--- a/addons/stock/wizard/stock_split_move.py
+++ b/addons/stock/wizard/stock_split_move.py
@@ -116,7 +116,7 @@ class stock_split_move_line(osv.osv_memory):
                 new_obj = move_obj.copy(cr, uid, move.id, {'product_qty' : new_qty, 'product_uos_qty': new_uos_qty, 'state':move.state})
                 uos_qty = quantity / move.product_qty * move.product_uos_qty
                 move_obj.write(cr, uid, [move.id], {'product_qty' : quantity, 'product_uos_qty': uos_qty})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 stock_split_move_line()
 
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index d7473e86b59..1f48c8cfc19 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -79,6 +79,6 @@ class stock_split_into(osv.osv_memory):
                         inventory_obj.write(cr, uid, inventory_id, {'move_ids': [(4, current_move)]}, context=context)
 
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 stock_split_into()
 
diff --git a/addons/stock/wizard/stock_ups.py b/addons/stock/wizard/stock_ups.py
index 9ba61d06977..fb47587f254 100644
--- a/addons/stock/wizard/stock_ups.py
+++ b/addons/stock/wizard/stock_ups.py
@@ -87,7 +87,7 @@ class stock_ups_upload(osv.osv_memory):
         report = netsvc._group['report']['report.stock.move.lot.ups_xml']
         data['report_type'] = 'raw'
         fp = file('/tmp/test.xml', 'w').write(report.create(uid, context['active_id'], ids, {}))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_ups_upload()
 
diff --git a/addons/stock_invoice_directly/i18n/es.po b/addons/stock_invoice_directly/i18n/es.po
index b6acc233195..9c9a9fdae58 100644
--- a/addons/stock_invoice_directly/i18n/es.po
+++ b/addons/stock_invoice_directly/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:23+0000\n"
+"PO-Revision-Date: 2010-12-28 07:53+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -30,6 +30,11 @@ msgid ""
 "        the invoicing wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"        Cuando envía o entrega mercancías, este módulo automáticamente "
+"lanza\n"
+"        el asistente de facturación si el albarán debe ser facturado.\n"
+"    "
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index def35742b99..d2c553d2e6f 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -48,7 +48,7 @@ class invoice_directly(osv.osv_memory):
                 'type': 'ir.actions.act_window',
                 'target': 'new',
             }
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 invoice_directly()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po
index 69b34bc2b99..818b9f45d77 100644
--- a/addons/stock_location/i18n/es.po
+++ b/addons/stock_location/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 08:48+0000\n"
+"PO-Revision-Date: 2010-12-28 08:51+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -186,7 +186,7 @@ msgstr "Compañía"
 #. module: stock_location
 #: view:product.product:0
 msgid "Logistics Flows"
-msgstr ""
+msgstr "Flujos de logística"
 
 #. module: stock_location
 #: help:stock.move,cancel_cascade:0
diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
index f1e7bd33a84..09773a66893 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -1,12 +1,15 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_product_pulled_flow_user","product_pulled_flow user","model_product_pulled_flow","stock.group_stock_user",1,0,0,0
 "access_product_pulled_flow_manager","product_pulled_flow manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
-"access_product_pulled_flow_partner_manager","product_pulled_flow partner manager","model_product_pulled_flow","product.group_product_manager",1,1,1,1
+"access_product_pulled_flow_salemanager","product_pulled_flow salemanager","model_product_pulled_flow","base.group_sale_manager",1,1,1,1
+"access_product_pulled_flow_stock_manager","product_pulled_flow stock manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
 "access_stock_location_path_user","stock location path user","model_stock_location_path","stock.group_stock_user",1,0,0,0
 "access_stock_location_path_internal_user","stock location path internal user","model_stock_location_path","base.group_user",1,0,0,0
 "access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
-"access_stock_location_path_partner_manager","stock.location.path partner manager","model_stock_location_path","product.group_product_manager",1,1,1,1
+"access_stock_location_path_sale_manager","stock.location.path partner salemanager","model_stock_location_path","base.group_sale_manager",1,1,1,1
+"access_stock_location_path_stock_manager","stock.location.path stock manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
 "access_stock_location_path_stock_user","stock.location.path stock user","model_stock_location_path","stock.group_stock_user",1,1,1,1
 "access_stock_location_path","stock.location.path","model_stock_location_path","base.group_sale_salesman",1,0,0,0
 "access_product_pulled_flow","product.pulled.flow","model_product_pulled_flow","base.group_sale_salesman",1,0,0,0
 "access_product_pulled_flow_internal","product.pulled.flow internal","model_product_pulled_flow","base.group_user",1,0,0,0
+
diff --git a/addons/stock_no_autopicking/i18n/es.po b/addons/stock_no_autopicking/i18n/es.po
index d84a82b6b13..33e7a8fe668 100644
--- a/addons/stock_no_autopicking/i18n/es.po
+++ b/addons/stock_no_autopicking/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 08:51+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 08:04+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -38,6 +37,19 @@ msgid ""
 "    supplier in the routing of the assembly operation.\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo permite un proceso de recogida intermedio para proveer "
+"materias\n"
+"    primas a las órdenes de fabricación.\n"
+"\n"
+"    Un ejemplo de uso de este módulo es gestionar la producción realizada "
+"por sus\n"
+"    proveedores (subcontratación). Para conseguir esto, establezca los "
+"productos ensamblados\n"
+"    que serán subcontratados a \"No Auto-Recogida\" y establezca la "
+"ubicación del nuevo\n"
+"    proveedor en el proceso de la operación de ensamblado.\n"
+"    "
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
index a89de0de4cb..e9b4e705792 100644
--- a/addons/survey/i18n/es.po
+++ b/addons/survey/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:55+0000\n"
+"PO-Revision-Date: 2010-12-28 08:47+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
@@ -397,6 +397,8 @@ msgstr "Texto"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
@@ -440,7 +442,7 @@ msgstr "Retrasado"
 #. module: survey
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
 
 #. module: survey
 #: field:survey.send.invitation,mail_from:0
@@ -781,13 +783,13 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,response:0
 msgid "#Answer"
-msgstr ""
+msgstr "#Respuesta"
 
 #. module: survey
 #: field:survey.print,without_pagebreak:0
 #: field:survey.print.answer,without_pagebreak:0
 msgid "Print Without Page Breaks"
-msgstr ""
+msgstr "Imprimir sin saltos de página"
 
 #. module: survey
 #: view:survey:0
@@ -795,6 +797,8 @@ msgstr ""
 #: view:survey.question:0
 msgid "When the comment is an invalid format, display this error message"
 msgstr ""
+"Mostrar este mensaje de error cuando el comentario esté en un formato no "
+"válido"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:0
@@ -803,6 +807,8 @@ msgid ""
 "You can not give more response. Please contact the author of this survey for "
 "further assistance."
 msgstr ""
+"No puede dar más respuestas. Póngase en contacto con el autor de esta "
+"encuesta para obtener más ayuda."
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_page_question
@@ -813,7 +819,7 @@ msgstr "Preguntas"
 #. module: survey
 #: help:survey,response_user:0
 msgid "Set to one if  you require only one Answer per user"
-msgstr ""
+msgstr "Establecer en uno si requiere solo una Respuesta por usuario"
 
 #. module: survey
 #: field:survey,users:0
@@ -871,6 +877,8 @@ msgstr "Registro (Log)"
 #: view:survey.question:0
 msgid "When the choices do not add up correctly, display this error message"
 msgstr ""
+"Mostrar este mensaje de error cuando las selecciones no totalicen "
+"correctamente"
 
 #. module: survey
 #: field:survey,date_close:0
@@ -925,7 +933,7 @@ msgstr "Cerrada"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Drop-down Menus"
-msgstr ""
+msgstr "Matriz de menús desplegables"
 
 #. module: survey
 #: view:survey:0
@@ -1006,7 +1014,7 @@ msgstr "Imprimir respuesta"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes"
-msgstr ""
+msgstr "Cuadros de texto múltiples"
 
 #. module: survey
 #: selection:survey.print,orientation:0
@@ -1033,7 +1041,7 @@ msgstr ""
 #. module: survey
 #: view:survey.question.column.heading:0
 msgid "Menu Choices (each choice on separate lines)"
-msgstr ""
+msgstr "Opciones de menú (cada opción en líneas separadas)"
 
 #. module: survey
 #: field:survey.response,response_type:0
@@ -1056,7 +1064,7 @@ msgstr "Esperando respuesta"
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Decimal Number"
-msgstr ""
+msgstr "Debe ser un número decimal"
 
 #. module: survey
 #: field:res.users,survey_id:0
@@ -1095,7 +1103,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.response.line,state:0
 msgid "Skiped"
-msgstr ""
+msgstr "Omitido"
 
 #. module: survey
 #: field:survey.print,paper_size:0
@@ -1123,7 +1131,7 @@ msgstr ""
 #: code:addons/survey/wizard/survey_selection.py:0
 #, python-format
 msgid "You can not give response for this survey more than %s times"
-msgstr ""
+msgstr "No puede responder esta encuesta más de %s veces"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.report_survey_form
@@ -1171,6 +1179,8 @@ msgstr "Historial"
 msgid ""
 "If this field is empty, all answers of the selected survey will be print."
 msgstr ""
+"Si este campo está vacío, se imprimirán todas las respuestas de la encuesta "
+"seleccionada."
 
 #. module: survey
 #: field:survey.type,code:0
@@ -1308,7 +1318,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Multiple Answers Per Row)"
-msgstr ""
+msgstr "Matriz de opciones (Múltiples respuestas por fila)"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_name
@@ -1339,7 +1349,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Comment/Essay Box"
-msgstr ""
+msgstr "Caja de comentarios/redacción"
 
 #. module: survey
 #: field:survey.answer,type:0
@@ -1493,7 +1503,7 @@ msgstr "Nombre"
 #. module: survey
 #: view:survey.page:0
 msgid "#Questions"
-msgstr ""
+msgstr "#Preguntas"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response
@@ -1537,7 +1547,7 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,menu_choice:0
 msgid "Menu Choices"
-msgstr ""
+msgstr "Opciones de menú"
 
 #. module: survey
 #: field:survey,page_ids:0
@@ -1588,7 +1598,7 @@ msgstr ""
 #. module: survey
 #: view:survey.answer:0
 msgid "Menu Choices (each choice on separate by lines)"
-msgstr ""
+msgstr "Opciones de menú (cada opción en líneas separadas)"
 
 #. module: survey
 #: selection:survey.answer,type:0
@@ -1644,13 +1654,13 @@ msgstr "Suma de todas las elecciones"
 #: selection:survey.question,type:0
 #: view:survey.response.line:0
 msgid "Table"
-msgstr ""
+msgstr "Tabla"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "You cannot duplicate the resource!"
-msgstr ""
+msgstr "¡No puede duplicar el recurso!"
 
 #. module: survey
 #: field:survey.question,comment_minimum_date:0
diff --git a/addons/thunderbird/i18n/es.po b/addons/thunderbird/i18n/es.po
index 288f3ceae71..b09250c2f62 100644
--- a/addons/thunderbird/i18n/es.po
+++ b/addons/thunderbird/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-20 05:49+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 09:16+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\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-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
@@ -87,6 +88,22 @@ msgid ""
 "\n"
 "      "
 msgstr ""
+"\n"
+"      Este módulo es necesario para que el conector (plug-in) de "
+"Thunderbird\n"
+"      funcione correctamente.\n"
+"      El conector permite guardar un correo y sus adjuntos en los objetos "
+"OpenERP\n"
+"      seleccionados. Puede seleccionar una empresa, una tarea, un proyecto, "
+"una cuenta\n"
+"      analítica, o cualquier otro objeto, y adjuntar el correo seleccionado "
+"como un fichero .eml\n"
+"      en los adjuntos del registro seleccionado. Puede crear documentos "
+"desde iniciativas CRM,\n"
+"      aplicación RRHH y incidencias de proyectos desde los correos "
+"seleccionados.\n"
+"\n"
+"      "
 
 #. module: thunderbird
 #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
@@ -144,7 +161,7 @@ msgstr "Configuración conector Thunderbird"
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_partner
 msgid "Thunderbid Plugin Tools"
-msgstr ""
+msgstr "Herramientas conector de Thunderbird"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome.manifest b/addons/thunderbird/plugin/openerp_plugin/chrome.manifest
index 5fa9c2f5754..5fa9c2f5754 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome.manifest
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome.manifest
diff --git a/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js b/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
index 40347a9993d..40347a9993d 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
+++ b/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
diff --git a/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt b/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt
index 8e59aa20c85..8e59aa20c85 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt
+++ b/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt
diff --git a/addons/thunderbird/plugin/openerp_plugin/install.js b/addons/thunderbird/plugin/openerp_plugin/install.js
index 50e4b301e32..50e4b301e32 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/install.js
+++ b/addons/thunderbird/plugin/openerp_plugin/install.js
diff --git a/addons/thunderbird/plugin/openerp_plugin/install.rdf b/addons/thunderbird/plugin/openerp_plugin/install.rdf
index b46c10c433b..b46c10c433b 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/install.rdf
+++ b/addons/thunderbird/plugin/openerp_plugin/install.rdf
diff --git a/addons/thunderbird/plugin/openerp_plugin/packaging.sh b/addons/thunderbird/plugin/openerp_plugin/packaging.sh
index 5c1f48a9050..5c1f48a9050 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/packaging.sh
+++ b/addons/thunderbird/plugin/openerp_plugin/packaging.sh
diff --git a/addons/users_ldap/i18n/es.po b/addons/users_ldap/i18n/es.po
index eba0be9e10a..6d6ae98d691 100644
--- a/addons/users_ldap/i18n/es.po
+++ b/addons/users_ldap/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 10:32+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 08:43+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: users_ldap
@@ -93,7 +92,7 @@ msgstr "res.compañía.ldap"
 #. module: users_ldap
 #: model:ir.module.module,description:users_ldap.module_meta_information
 msgid "Adds support for authentication by ldap server"
-msgstr ""
+msgstr "Añade soporte para autenticación contra un servidor ldap"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
diff --git a/addons/users_ldap/i18n/pl.po b/addons/users_ldap/i18n/pl.po
new file mode 100644
index 00000000000..700cb160bf7
--- /dev/null
+++ b/addons/users_ldap/i18n/pl.po
@@ -0,0 +1,128 @@
+# 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: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2010-12-28 09:09+0000\n"
+"Last-Translator: OpenERP Administrators <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-12-29 04:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Wybrana firma jest niedozwolona dla tego użytkownika"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parametry LDAP"
+
+#. module: users_ldap
+#: view:res.company:0
+msgid "LDAP Configuration"
+msgstr "Konfiguracja LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Utwórz użytkownika, jeśli nie ma w bazie"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Model stosowany do tworzenia użytkownika"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Adres serwera LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Port serwera LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Baza LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Firmy"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Hasło LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.module.module,description:users_ldap.module_meta_information
+msgid "Adds support for authentication by ldap server"
+msgstr "Dodaje obsługę autentykacji przez serwer LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Numeracja"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nie możesz mieć dwóch użytkowników z tym samym loginem !"
+
+#. module: users_ldap
+#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
+msgid "Authenticate users with ldap server"
+msgstr "Autentykuj użytkowników serwerem LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Model użytkownika"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtr LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Utwórz użytkownika"
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index b8bfd32e9d4..7e673fbdd71 100644
--- a/addons/warning/i18n/es.po
+++ b/addons/warning/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-16 17:20+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 08:51+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -163,7 +164,7 @@ msgstr ""
 #: code:addons/warning/warning.py:0
 #, python-format
 msgid "Alert for %s !"
-msgstr ""
+msgstr "¡Alerta para %s!"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
@@ -214,12 +215,12 @@ msgstr "Empresa"
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Línea pedido de venta"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index 5c34b2b279f..0a85f4c097a 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-26 06:51+0000\n"
+"PO-Revision-Date: 2010-12-27 09:18+0000\n"
 "Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/wiki/i18n/es.po b/addons/wiki/i18n/es.po
index c4f223ccb7e..f69e0660c69 100644
--- a/addons/wiki/i18n/es.po
+++ b/addons/wiki/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:37+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 09:12+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@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-12-24 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -269,6 +268,11 @@ msgid ""
 "keep track for the wiki groups, pages, and history\n"
 "    "
 msgstr ""
+"\n"
+"El módulo base para gestionar documentos (wiki)\n"
+"\n"
+"gestione los grupos, páginas e historial del wiki\n"
+"    "
 
 #. module: wiki
 #: view:wiki.groups:0
diff --git a/addons/wiki/test/wiki_test00.yml b/addons/wiki/test/wiki_test00.yml
index d5a9cbc4bbb..d5a9cbc4bbb 100755..100644
--- a/addons/wiki/test/wiki_test00.yml
+++ b/addons/wiki/test/wiki_test00.yml
diff --git a/addons/wiki/web/widgets/rss/feedparser.py b/addons/wiki/web/widgets/rss/feedparser.py
index 6f30574d300..6f30574d300 100755..100644
--- a/addons/wiki/web/widgets/rss/feedparser.py
+++ b/addons/wiki/web/widgets/rss/feedparser.py
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index f3503936c78..2236f1f69ce 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -86,7 +86,7 @@ class wiki_group(osv.osv):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
             value['view_id'] = view_id
             value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
             value['view_type'] = 'tree'
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index a8b56db8534..a8f53a5c3a5 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -85,8 +85,8 @@
         </record>
 
         <!-- wiki Tree view For child -->
-        <record id="view_wiki_tree_childs" model="ir.ui.view">
-            <field name="name">wiki.wiki.tree.childs</field>
+        <record id="view_wiki_tree_children" model="ir.ui.view">
+            <field name="name">wiki.wiki.tree.children</field>
             <field name="model">wiki.wiki</field>
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index f95c1e2dffd..654a9ff3898 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -72,7 +72,7 @@ class wiki_create_menu(osv.osv_memory):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
             value['view_id'] = view_id
             value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
             value['view_type'] = 'tree'
@@ -86,7 +86,7 @@ class wiki_create_menu(osv.osv_memory):
                         'action': 'ir.actions.act_window,'+ str(action_id),
                         }, context)
         obj_wiki_group.write(cr, uid, [group_id], {'menu_id':menu_id})        
-        return {}
+        return {'type':  'ir.actions.act_window_close'}
 
 
 wiki_create_menu()
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py
index 6b159b7ac30..1e2dae8f92d 100644
--- a/addons/wiki/wizard/wiki_make_index.py
+++ b/addons/wiki/wizard/wiki_make_index.py
@@ -87,7 +87,7 @@ class wiki_make_index(osv.osv_memory):
             for rs in result:
                 wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]})
 
-        return {}
+        return {'type':  'ir.actions.act_window_close'}
 
 wiki_make_index()
 
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 1fe4f8acc49..215a49f29fe 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 
 class wiki_wiki_page_open(osv.osv_memory):
     """ wizard Open Page """
@@ -54,7 +54,7 @@ class wiki_wiki_page_open(osv.osv_memory):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
             value['view_id'] = view_id
             value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
             value['view_type'] = 'tree'
diff --git a/addons/wiki_faq/i18n/es.po b/addons/wiki_faq/i18n/es.po
index ce3e59f945d..e1ac4cf5ed5 100644
--- a/addons/wiki_faq/i18n/es.po
+++ b/addons/wiki_faq/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:51+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 07:46+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_faq
@@ -30,7 +29,7 @@ msgstr ""
 #. module: wiki_faq
 #: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
 msgid "Document Management - Wiki - FAQ"
-msgstr ""
+msgstr "Gestion documental - Wiki - Preguntas frecuentes"
 
 #~ msgid "The certificate ID of the module must be unique !"
 #~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/wiki_quality_manual/i18n/es.po b/addons/wiki_quality_manual/i18n/es.po
index 53b2a988d6b..67e9a9a8fcc 100644
--- a/addons/wiki_quality_manual/i18n/es.po
+++ b/addons/wiki_quality_manual/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:37+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 09:12+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_quality_manual
@@ -30,7 +29,7 @@ msgstr ""
 #. module: wiki_quality_manual
 #: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
 msgid "Document Management - Wiki - Quality Manual"
-msgstr ""
+msgstr "Gestió documental - Wiki - Manual de calidad"
 
 #~ msgid "The certificate ID of the module must be unique !"
 #~ msgstr "¡El ID del certificado del módulo debe ser único!"
diff --git a/addons/wiki_sale_faq/i18n/es.po b/addons/wiki_sale_faq/i18n/es.po
index 13bcc93f03f..15b12b75f93 100644
--- a/addons/wiki_sale_faq/i18n/es.po
+++ b/addons/wiki_sale_faq/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:37+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 08:08+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq
@@ -27,6 +26,12 @@ msgid ""
 "used to easily tag wiki pages. You should use this application with the "
 "OpenERP web client interface."
 msgstr ""
+"Las páginas wiki le permiten compartir ideas y cuestiones con sus compañeros "
+"de trabajo. Puede crear un nuevo documento que puede ser enlazado a una o "
+"varias aplicaciones (especificaciones de un proyecto, una página de "
+"preguntas frecuentes para el equipo de ventas, etc.). Pueden usarse palabras "
+"claves fácilmente para etiquetar páginas wiki. Debería utilizar esta "
+"aplicación con la interfaz del cliente web de OpenERP."
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -64,6 +69,12 @@ msgid ""
 "the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and "
 ".PDF documents."
 msgstr ""
+"Documentos le da acceso a todos los archivos adjuntos a cualquier registro. "
+"Es un repositorio de todos los documentos como correos, adjuntos "
+"relacionados con proyectos o cualquier otro documento. Desde esta vista, "
+"puede buscar los contenidos de los documentos. OpenERP automáticamente "
+"asigna meta-datos según el registro, como el tercero asociado o los índices "
+"del contenido de archivos .DOC, .ODT, .TXT, .SXW y .PDF."
 
 #. module: wiki_sale_faq
 #: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
author	uco (OpenERP) <uco@tinyerp.com>	2010-12-30 11:37:53 +0530
committer	uco (OpenERP) <uco@tinyerp.com>	2010-12-30 11:37:53 +0530
commit	e0416f8a8fb82174fdaafdbf4bb6dfced55a2b04 (patch)
tree	5d46c1dd0eb72bf230a4bcbf9d7980ada4c8fd51 /addons
parent	c3098f4f437708c7b2d6d4a52cd02950c5b67f31 (diff)
parent	b352cf0e20d1e17f4cdbd93c3c388fc0004ea50a (diff)