[MERGE]with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: jam@tinyerp.com-20101228103052-mnkvkeate2efuc7p bzr revid: jam@tinyerp.com-20101229045310-ls49g99b96smes9s bzr revid: jam@tinyerp.com-20101229085850-eg8k31drdh0dpg0b
author: jam-openerp <jam@tinyerp.com> 2010-12-29 14:28:50 +0530
committer: jam-openerp <jam@tinyerp.com> 2010-12-29 14:28:50 +0530
commit: 283ccb7cb7ea08bb1d97be53d34ef86e1c2ca3d1 (patch)
tree: 5e4461435eaea37121c599e6f5af97927a7cc8f4
parent: 1634cb448ab0689814a7c1add18cef5c41cc000f (diff)
parent: d13abf368f7e68aeb7bf2a58ad9a5e6b47eb3385 (diff)
503 files changed, 6552 insertions, 1806 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..7db46e935b5 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -7845,7 +7845,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 "
+"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 ""
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index dbbd21e50d8..7b5b0d9cac9 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -7876,7 +7876,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 "
+"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 ""
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index 2a061082fd8..19a05b00c9b 100644
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 5322c0d60a9..35dfd9669ab 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -7900,7 +7900,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index f925b4f45cf..2201ee988f1 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -7935,7 +7935,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 0bfa2c08c6f..722527a41ff 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -7842,7 +7842,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 "
+"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 ""
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index f1c57937954..fc33be16eba 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -7862,7 +7862,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 "
+"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 ""
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 6fb7d341308..475eba310ce 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -8408,7 +8408,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 49f706f26d3..e0c4d54edde 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-27 14: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-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+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,7 +7966,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 "
+"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 ""
@@ -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 39c0dcd8ef6..6b8f08ebf02 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-24 13:01+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-27 10:40+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-25 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -187,7 +186,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id: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
@@ -2636,6 +2642,8 @@ msgid ""
 "given a period and a journal, the sum of debit will always be equal to the "
 "sum of credit, so there is no point to display it"
 msgstr ""
+"dado un período y un diario, la suma del debe será siempre igual a la suma "
+"del haber, por lo que no hay lugar para mostrarlo"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -2651,6 +2659,11 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Marque esta opción si no desea que los nuevos asientos pasen por el estado "
+"'Borrador' y por tanto vayan directamente al estado 'Fijado' sin ninguna "
+"validación manual. \n"
+"Tenga en cuenta que los asientos creados automáticamente por el sistema "
+"siempre se saltan ese estado."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
@@ -2783,6 +2796,8 @@ msgstr ""
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
+"Utilizado en el dominio de conciliación de extractos, pero no debería ser "
+"usado en otro sitio."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -3068,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
@@ -3371,6 +3395,10 @@ msgid ""
 "that you can control what you received from your supplier according to what "
 "you purchased or received."
 msgstr ""
+"Las facturas de proveedores le permiten introducir y gestionar las facturas "
+"emitidas por sus proveedores. OpenERP genera un borrador de facturas de "
+"proveedor de forma automática, para que pueda controlar lo que recibió de su "
+"proveedor de acuerdo a lo que compró o recibió."
 
 #. module: account
 #: report:account.invoice:0
@@ -3476,6 +3504,9 @@ msgid ""
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"La fecha de vencimiento de la línea de asiento generado por la línea del "
+"modelo '%s' del modelo '%s' se basa en el plazo de pago de la empresa.\n"
+"¡Por favor, defina la empresa en él!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -3621,6 +3652,7 @@ msgstr "Nº asientos"
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
+"Ha seleccionado una unidad de medida que no es compatible con el producto."
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -3721,6 +3753,10 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"Lo más recomendable es usar un diario dedicado a contener los asientos de "
+"apertura de todos los ejercicios. Tenga en cuenta que lo debería definir con "
+"cuentas de debe/haber por defecto, de tipo 'situación' y con una "
+"contrapartida centralizada."
 
 #. module: account
 #: view:account.installer:0
@@ -3755,6 +3791,7 @@ msgstr "Validar"
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
 msgstr ""
+"¡Valor de haber o debe en el modelo erróneo (haber o debe debería ser \"0\")!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3763,6 +3800,10 @@ msgid ""
 "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."
 msgstr ""
+"A partir de este informe, puede tener una visión general del importe "
+"facturado a sus clientes, así como los retrasos en los pagos. La herramienta "
+"de búsqueda también se puede utilizar para personalizar los informes de las "
+"facturas y por tanto, adaptar este análisis a sus necesidades."
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -3837,6 +3878,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar la cuenta sin eliminarla."
 
 #. module: account
 #: view:account.tax.template:0
@@ -3967,6 +4009,11 @@ msgid ""
 "the system on document validation (invoices, bank statements...) and will be "
 "created in 'Posted' state."
 msgstr ""
+"Todas los nuevos asientos creados manualmente están, por lo general, en "
+"estado 'No fijado', pero puede configurar la opción de omitir ese estado en "
+"el diario relacionado. En ese caso, se comportan como asientos creados "
+"automáticamente por el sistema en la validación de documentos (facturas, "
+"extractos bancarios, ...) y se crearán en estado 'Fijado'."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:0
@@ -4133,7 +4180,7 @@ msgstr "Contabilidad. Seleccionar diario"
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "Imprimir factura"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4181,6 +4228,11 @@ msgid ""
 "you can create them in the system in order to automate their entries in the "
 "system."
 msgstr ""
+"Un asiento recurrente es un asiento relacionados con los pagos que se "
+"produce de forma recurrente a partir de una fecha concreta correspondiente a "
+"la firma de un contrato o un acuerdo con un cliente o proveedor. Mediante la "
+"definición de asientos recurrentes, puede automatizar sus asientos en el "
+"sistema."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4719,6 +4771,7 @@ msgstr "Nombre columna"
 msgid ""
 "This report gives you an overview of the situation of your general journals"
 msgstr ""
+"Este informe proporciona una vista general de la situación de sus diarios"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4889,6 +4942,8 @@ msgstr "Impuesto en hijos"
 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: account
 #: code:addons/account/account.py:0
@@ -5072,6 +5127,9 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
+"Estos son las empresas restantes a las que debería comprobar si hay algo "
+"para conciliar o no. Esta cifra ya contabiliza la empresa actual como "
+"conciliada."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5233,6 +5291,11 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Si no debe introducir más asientos en un ejercicio fiscal, lo puede cerrar "
+"desde aquí. Se cerrarán todos los períodos abiertos en este ejercicio que "
+"hará imposible introducir ningún asiento nuevo. Cierre un ejercicio fiscal "
+"cuando necesite finalizar los resultados de fin de ejercicio "
+"definitivamente. "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5268,7 +5331,7 @@ msgstr "Válido hasta"
 #. module: account
 #: view:board.board:0
 msgid "Aged Receivables"
-msgstr ""
+msgstr "A cobrar antiguos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5444,6 +5507,8 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
+"Le muestra el progreso realizado hoy en el proceso de conciliación. Indica:\n"
+"Empresas conciliadas hoy / (Empresas restantes + Empresas conciliadas hoy)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5452,6 +5517,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
+"Seleccione aquí el tipo de valoración relacionada con esta línea de plazo de "
+"pago. Tenga en cuenta que debe tener la última línea con el tipo 'Saldo' "
+"para garantizar que el importe total sea procesado."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5624,6 +5692,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
@@ -5719,7 +5793,7 @@ msgstr "Configuración informes"
 #. module: account
 #: 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: account
 #: field:account.tax,type:0
@@ -5866,7 +5940,7 @@ msgstr "Cuenta haber por defecto"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "Configure su plan contable"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5996,6 +6070,10 @@ msgid ""
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
+"Este asistente generará los asientos de fin de ejercicio para el ejercicio "
+"fiscal seleccionado. Tenga en cuenta que puede ejecutar este asistente "
+"varias veces para el mismo ejercicio fiscal: simplemente se sustituyen los "
+"asientos de apertura viejos por los nuevos."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
@@ -6010,6 +6088,10 @@ msgid ""
 "the tool search to analyse information about analytic entries generated in "
 "the system."
 msgstr ""
+"Desde esta vista, dispone de un análisis de los distintos asientos "
+"analíticos de la cuenta analítica que ha definido para ajustarse a sus "
+"necesidades del negocio. Utilice la herramienta de búsqueda para analizar la "
+"información sobre los asientos analíticos generados en el sistema."
 
 #. module: account
 #: sql_constraint:account.journal:0
@@ -6061,7 +6143,7 @@ msgstr "Centralización"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "Generar su plan contable desde una plantilla de plan contable"
 
 #. module: account
 #: view:account.account:0
@@ -6339,6 +6421,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
@@ -6367,6 +6454,8 @@ msgid ""
 "This report is an analysis done by a partner. It is a PDF report containing "
 "one line per partner representing the cumulative credit balance"
 msgstr ""
+"Este informe es un análisis realizado por una empresa. Es un informe PDF que "
+"contiene una línea por empresa representando el saldo del haber acumulativo."
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:0
@@ -6405,6 +6494,8 @@ msgstr "Todos los asientos"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+"categoría."
 
 #. module: account
 #: view:account.journal.select:0
@@ -6449,6 +6540,9 @@ msgid ""
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
+"Este informe le permite imprimir o generar un pdf de su balance de sumas y "
+"saldos permitiendo comprobar con rapidez el saldo de cada una de sus cuentas "
+"en un único informe."
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6456,6 +6550,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Marque esta opción si no está seguro de este asiento y desea marcarlo como "
+"'Para ser revisado' por un experto contable."
 
 #. module: account
 #: help:account.installer.modules,account_voucher:0
@@ -6463,6 +6559,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
@@ -6576,6 +6675,9 @@ msgid ""
 "Here you can personalize and create each view of your financial journals by "
 "selecting the fields you want to appear and the sequence they will appear."
 msgstr ""
+"Aquí puede personalizar y crear cada vista de sus diarios financieros "
+"seleccionando los campos que desea que aparezcan y la secuencia en la que "
+"aparezcan."
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -6660,6 +6762,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
@@ -6734,6 +6843,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
@@ -6933,6 +7062,9 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), Which is calculated from "
 "Profit & 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 "
+"calcula en el informe de Pérdidas y Ganancias."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -6964,7 +7096,7 @@ msgstr "No puede tener dos registros abiertos para el mismo diario"
 #. module: account
 #: report:account.invoice:0
 msgid "Must be after setLang()"
-msgstr ""
+msgstr "Debe estar después de setLang()"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -6974,7 +7106,7 @@ msgstr "  día del mes= -1"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "¡Error! No puede crear miembros asociados recursivos."
 
 #. module: account
 #: help:account.journal,type:0
@@ -7229,7 +7361,7 @@ msgstr "Activo"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Días    "
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
@@ -7444,7 +7576,7 @@ msgstr "Asiento automático"
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "¡Error! No puede crear códigos de impuestos recursivos."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7537,6 +7669,7 @@ msgstr "Estado de la factura es Abierta"
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
 msgstr ""
+"Añade funcionalidades contables extras a las que ya tiene instaladas."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7705,6 +7838,9 @@ msgid ""
 "information. To search for account entries, open a journal, then select a "
 "record line."
 msgstr ""
+"Puede buscar asientos contables individuales mediante la búsqueda de "
+"información útil. Para buscar asientos contables, abra un diario y "
+"seleccione una línea de registro."
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -8022,6 +8158,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
 #: model:account.account.type,name:account.account_type_expense
@@ -8156,6 +8294,9 @@ msgid ""
 "will be added, Loss: Amount will be deducted.), 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 "
+"calcula en el informe de Pérdidas y Ganancias."
 
 #. module: account
 #: field:account.invoice,reference_type:0
@@ -8165,10 +8306,13 @@ 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 "
+"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 "
+"calcula en el informe de Pérdidas y Ganancias."
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -8202,6 +8346,9 @@ msgid ""
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
+"Puede indicar aquí el coeficiente que se utilizará cuando se consolide el "
+"importe de este código dentro de su padre. Por ejemplo, indique 1/-1 si "
+"desea sumar/restar el importe."
 
 #. module: account
 #: view:account.invoice:0
@@ -8304,6 +8451,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
@@ -8313,7 +8464,7 @@ msgstr "Apreciado Sr./Sra.,"
 #. module: account
 #: view:account.installer.modules:0
 msgid "Configure Your Accounting Application"
-msgstr ""
+msgstr "Configure su aplicación de contabilidad"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -8325,6 +8476,12 @@ 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
@@ -8450,7 +8607,7 @@ msgstr "Documento: Estado contable del cliente"
 #. module: account
 #: 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."
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
@@ -8889,7 +9046,7 @@ msgstr "Activo"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "Error desconocido"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -8985,6 +9142,9 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"La fecha de vencimiento de la línea de asiento generado por la línea del "
+"modelo '%s' se basa en el plazo de pago de la empresa.\n"
+"¡Por favor, defina la empresa en él!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -9132,6 +9292,8 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"Este informe le permite imprimir o generar un pdf de su libro mayor con el "
+"detalle de todos sus diarios contables."
 
 #. module: account
 #: selection:account.account,type:0
@@ -9489,7 +9651,7 @@ msgstr ""
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
 
 #. module: account
 #: view:account.subscription:0
@@ -9573,7 +9735,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
@@ -9801,6 +9963,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar el diario analítico sin "
+"eliminarlo."
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -9820,7 +9984,7 @@ msgstr "Modelo de asiento"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -9835,7 +9999,7 @@ msgstr "Cuenta bancaria"
 #: 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 "Diario central contable"
 
 #. module: account
 #: report:account.overdue:0
@@ -9850,7 +10014,7 @@ msgstr "Futuro"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Buscar líneas asientos"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -9877,7 +10041,7 @@ msgstr "Cuenta de gastos en plantilla producto"
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr ""
+msgstr "Moneda del importe"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:0
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 49657cf5fbb..22b2943171e 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -7937,7 +7937,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 94628420609..b31e3b1b27f 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -8249,11 +8249,11 @@ 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 "
+"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 "
+"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"
 
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 46cee533cf1..3483fd89fa5 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -7843,7 +7843,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index 4dec16e476d..e2fa2d47565 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 5273f442a5d..6e975ce508e 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index 045fb9f9043..ef3d8ed27d9 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -7907,7 +7907,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 965d91595fd..bf390c81c5d 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/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-25 21:26+0000\n"
+"PO-Revision-Date: 2010-12-26 07:43+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-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8353,7 +8353,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 3396039cb70..444e9c4cd8a 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index eea4bae7672..8b830dd6662 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index a7ac09a554b..12b561f2a70 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index 664960b54ee..44a12e35dea 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@@ -7844,7 +7844,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 "
+"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 ""
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 76ae9e0364c..7afaec736eb 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -7872,7 +7872,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 449317241bb..d72269a3630 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7846,7 +7846,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 "
+"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 ""
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index e3bcae130db..6a4543117ea 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -7847,7 +7847,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 "
+"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 ""
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 03ac65c3b3c..f7d74941c9a 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-21 14:46+0000\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-24 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -31,6 +31,8 @@ msgstr "Altra configurazione"
 #, python-format
 msgid "No journal for ending writing has been defined for the fiscal year"
 msgstr ""
+"Nessun giornale è stato definito per l'anno fiscale per le scritture di "
+"chiusura"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -39,13 +41,13 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
-"Non si può rimuovere o disattivare un conto che è stato definito come "
-"proprietà per un partner-"
+"Non si può rimuovere o disattivare un conto che è stato collegato come "
+"proprietà per un Partner"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Riconciliazione Scritture"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
@@ -64,7 +66,7 @@ msgstr "Statistiche contabili"
 #: field:account.invoice,residual:0
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr "Rimanenze"
+msgstr "Riserva"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -85,7 +87,7 @@ msgstr "Valuta del Conto"
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Definizione sottoconti"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -185,7 +187,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Attenzione!"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -297,7 +299,7 @@ msgstr "Bilancio calcolato"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "Inserimento Manuale Scrittura Periodica"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -307,7 +309,7 @@ msgstr "Chiudi anno fiscale"
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr ""
+msgstr "Permetti lo storno"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -499,6 +501,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"Quando viene creato un registro periodico il suo stato è 'bozza', se "
+"stampato il suo stato  è: 'stampato'. Quando sono registrate tutte le "
+"tranazioni il suo stato è: 'Completato'"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -554,7 +559,7 @@ msgstr "Conferma le fatture selezionate"
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "Riferimento gerarchico superiore"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -743,7 +748,7 @@ msgstr "Conti di crediti su clienti"
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "Report Contabilità Generale"
 
 #. module: account
 #: view:account.invoice:0
@@ -840,7 +845,7 @@ msgstr "Riconciliazione automatica"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due date Computation"
-msgstr ""
+msgstr "Calcolo data di scadenza"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -1095,7 +1100,7 @@ msgstr ""
 #. module: account
 #: report:account.partner.balance:0
 msgid "In dispute"
-msgstr ""
+msgstr "In contestazione"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
@@ -1106,7 +1111,7 @@ msgstr "Registri di cassa"
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Expense Accounts)"
-msgstr ""
+msgstr "Profitti e perdite (Conti di debito)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -1493,7 +1498,7 @@ msgstr "Chiuso"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Scritture di Contabilità Periodiche"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -1825,7 +1830,7 @@ msgstr "Analisi delle fatture"
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "Chiusura periodo"
 
 #. module: account
 #: view:account.installer:0
@@ -1846,7 +1851,7 @@ msgstr ""
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr "Voce nel registro"
+msgstr "Registrazione Contabile"
 
 #. module: account
 #: view:account.tax:0
@@ -3131,7 +3136,7 @@ msgstr "Acquisto"
 #: model:ir.actions.act_window,name:account.action_account_installer
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Configurazione Modulo di Contabilià"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -3220,7 +3225,7 @@ msgstr "Ricerca del registro contabile"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "Fattura Aperta"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -3626,6 +3631,7 @@ msgstr "# Voci"
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
+"E' stata selezionata una Unità di Misura non compatibile con il prodotto"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -3644,7 +3650,7 @@ msgstr "Apri fattura"
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Fattore di Moltiplicazione del codice tassa"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3857,7 +3863,7 @@ msgstr "Ricerca del template per le imposte"
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "Registrazioni in stato Bozza"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -5191,7 +5197,7 @@ msgstr "Numero (movimento)"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr "Opzioni per rimborso fatture"
+msgstr ""
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -7181,7 +7187,7 @@ msgstr "Sì"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr "Venditeper tipo di conto"
+msgstr "Vendite per tipo conto"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -7429,8 +7435,8 @@ msgid ""
 "This account will be used for invoices instead of the default one to value "
 "sales for the current product"
 msgstr ""
-"Questo conto verra' usato per le fatture al posto del  default per le "
-"vendite di questo prodotto"
+"Questo conto verra' usato per le fatture al posto del conto di default per i "
+"ricavi configurato per questo prodotto"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -7682,6 +7688,8 @@ msgid ""
 "This account will be used for invoices to value sales for the current "
 "product category"
 msgstr ""
+"Questo conto verra' usato per le fatture al posto del conto di ricavo per la "
+"categoria prodotto"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -7850,7 +7858,7 @@ msgstr ""
 #: field:account.invoice.report,date_due:0
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr "Data di Scadenza"
+msgstr "Data scadenza"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_payables
@@ -8131,7 +8139,7 @@ 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 "
+"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 ""
@@ -8204,7 +8212,7 @@ msgstr "Periodo da"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Giornale Nota di Credito"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -8574,7 +8582,7 @@ msgstr "Filtra per"
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Registrazione Manuale"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -8710,7 +8718,7 @@ msgstr "piano dei conti"
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr "Data di scadenza"
+msgstr "Data scadenza"
 
 #. module: account
 #: view:account.move.journal:0
@@ -8920,7 +8928,7 @@ msgstr ""
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr ""
+msgstr "Modello di  Registrazione"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:0
@@ -9262,7 +9270,7 @@ msgstr "Azienda"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Definizione Scritture Periodiche"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
@@ -9536,12 +9544,12 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "Fatturazione"
 
 #. module: account
 #: view:account.account:0
 msgid "Parent Account"
-msgstr ""
+msgstr "Conto Padre"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -9654,7 +9662,7 @@ msgstr "Documenti contabili"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Conferma Movimenti Contabili"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@@ -9701,7 +9709,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
 msgid "account.addtmpl.wizard"
-msgstr ""
+msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
@@ -9804,7 +9812,7 @@ msgstr "Conto spese per il prodotto"
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr ""
+msgstr "Valuta dell'importo"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:0
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 8d67f4b3d7a..17cb3908f17 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index d1bf19a61a0..31435872c44 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 50f80d73e7f..6b8fa6eae0d 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -7886,7 +7886,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index 16bcd197789..e8455d0549f 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -7855,7 +7855,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 "
+"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 ""
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 54dc22b52c8..4d46104cfdb 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8039,7 +8039,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 "
+"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 ""
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 2732bce797f..2886d174b15 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 15c20b21faa..ed55fea12cc 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7968,7 +7968,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 0b4bed67680..7f1500287f8 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -7874,7 +7874,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 1328a58c123..f7c8e1f9354 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 35ecc100775..3ce5a1f48f4 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7970,7 +7970,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 7d6a4c7be37..e4987b74c53 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -7985,7 +7985,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 0c2d1a1c10a..95b041cfe4e 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7938,7 +7938,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 53b52beeadc..7e388ec9e1f 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -7919,7 +7919,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index e1a02db74ea..e34e9be6358 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7897,7 +7897,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 "
+"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 ""
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 66d10b88dcd..3c1027c59dc 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 36f9e6996a5..e2968ffaeb2 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -7846,7 +7846,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 "
+"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 ""
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index 258d3a34aa6..e2c0082c3c8 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -7864,7 +7864,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index f526b5d2001..9ed78c77c82 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -7859,7 +7859,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 "
+"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 ""
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 537b766df88..781d08b832f 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -7901,7 +7901,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index b2b9311761b..86ce9ff25a4 100644
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@@ -7901,7 +7901,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index d3886397fac..b1208d79002 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7946,7 +7946,7 @@ 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 "
+"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 ""
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index e5463309759..d55e950ab25 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 1c6fe2fe410..23778ab9ee0 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 4f979ec950e..5577baa72b8 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 25439ff75e2..5aa34d6ab1e 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -7842,7 +7842,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 "
+"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 ""
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 5ca2976f566..d8a9e382942 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -8115,11 +8115,11 @@ 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 "
+"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 "
+"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"
 
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index 9745095677e..ed3f77b708e 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 0db0ccdc2ee..7f83feb9b0f 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -7848,7 +7848,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 "
+"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 ""
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index c339c35cae6..5949c81ca45 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -8238,11 +8238,11 @@ 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 "
+"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 "
+"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"
 
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index c5ca498c97e..81b29a22a73 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7849,7 +7849,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 "
+"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 ""
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index faf37a69d55..be9a359125a 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -7843,7 +7843,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 "
+"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 ""
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index da7e9f7e4a4..bb287c8aefd 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -7842,7 +7842,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 "
+"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 ""
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..68839c8f18c 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -9,7 +9,9 @@
 "access_account_account_user","account.account user","model_account_account","base.group_user",1,0,0,0
 "access_account_account_partner_manager","account.account partner manager","model_account_account","base.group_partner_manager",1,0,0,0
 "access_account_journal_view","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0
+"access_account_journal_view_hruser","account.journal.view hruser","model_account_journal_view","base.group_hr_user",1,0,0,0
 "access_account_journal_column","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
+"access_account_journal_column_hruser","account.journal.column hruser","model_account_journal_column","base.group_hr_user",1,0,0,0
 "access_account_journal","account.journal","model_account_journal","account.group_account_user",1,0,0,0
 "access_account_period","account.period","model_account_period","account.group_account_user",1,0,0,0
 "access_account_journal_period_manager","account.journal.period manager","model_account_journal_period","account.group_account_manager",1,0,0,0
@@ -31,7 +33,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 +71,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 +99,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 +119,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_change_currency.py b/addons/account/wizard/account_change_currency.py
index 47f9ac9c2c8..d915a1cd34b 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -72,7 +72,7 @@ class account_change_currency(osv.osv_memory):
                 new_price = (line.price_unit / old_rate ) * rate
             obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price})
         obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_change_currency()
 
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 42383341828..6190f792c7f 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -215,7 +215,7 @@ class account_fiscalyear_close(osv.osv_memory):
         cr.execute('UPDATE account_fiscalyear ' \
                     'SET end_journal_period_id = %s ' \
                     'WHERE id = %s', (ids[0], old_fyear.id))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_fiscalyear_close()
 
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 9a559d039da..abf054746ce 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -57,7 +57,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
             fy_pool = self.pool.get('account.fiscalyear')
             fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
             fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 account_fiscalyear_close_state()
 
diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
index 2e7a519aa34..7adcb908a34 100644
--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@@ -43,7 +43,7 @@ class account_invoice_confirm(osv.osv_memory):
             if record['state'] not in ('draft','proforma','proforma2'):
                 raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
             wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_invoice_confirm()
 
@@ -67,7 +67,7 @@ class account_invoice_cancel(osv.osv_memory):
             if record['state'] in ('cancel','paid'):
                 raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))
             wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_invoice_cancel()
 
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_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index 582bbc36619..541e7b2cbdb 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -42,7 +42,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
         ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
         if ids_move:
             cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_open_closed_fiscalyear()
 
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index 3b3acecc389..5b7589d7830 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -50,7 +50,7 @@ class account_period_close(osv.osv_memory):
                     # Log message for Period
                     for period_id, name in period_pool.name_get(cr, uid, [id]):
                         period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_period_close()
 
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index f89ffb47a76..8131f6a9668 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -101,7 +101,7 @@ class account_move_line_reconcile(osv.osv_memory):
                 context.update({'stop_reconcile': True})
         account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                                         period_id, journal_id, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_move_line_reconcile()
 
@@ -145,7 +145,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
         if context is None:
             context = {}
         account_move_line_obj.reconcile_partial(cr, uid, context['active_ids'], 'manual', context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def trans_rec_reconcile(self, cr, uid, ids, context=None):
         account_move_line_obj = self.pool.get('account.move.line')
@@ -169,7 +169,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
         context.update({'stop_reconcile': True})
         account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                 period_id, journal_id, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_move_line_reconcile_writeoff()
 
diff --git a/addons/account/wizard/account_reconcile_partner_process.py b/addons/account/wizard/account_reconcile_partner_process.py
index 9f91d1ec2d2..7cfeff70891 100644
--- a/addons/account/wizard/account_reconcile_partner_process.py
+++ b/addons/account/wizard/account_reconcile_partner_process.py
@@ -83,7 +83,7 @@ class account_partner_reconcile_process(osv.osv_memory):
             res_partner_obj.write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context)
         #TODO: we have to find a way to update the context of the current tab (we could open a new tab with the context but it's not really handy)
         #TODO: remove that comments when the client side dev is done
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     _columns = {
         'to_reconcile': fields.float('Remaining Partners', readonly=True, help='This is the remaining partners for who you should check if there is something to reconcile or not. This figure already count the current partner as reconciled.'),
diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index 6b8c4371dd2..1c3743bf3c7 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -32,17 +32,6 @@ 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}
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..f76beb6bee1 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -44,16 +44,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..174c172fdaa 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -32,36 +32,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',
@@ -77,4 +86,4 @@ class account_bs_report(osv.osv_memory):
 
 account_bs_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+\ No newline at end of file
diff --git a/addons/account/wizard/account_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..444d91fa8fd 100644
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@@ -40,21 +40,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 = {}
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/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py
index 2a03a80aefa..81705771d67 100644
--- a/addons/account/wizard/account_state_open.py
+++ b/addons/account/wizard/account_state_open.py
@@ -37,7 +37,7 @@ class account_state_open(osv.osv_memory):
                 raise osv.except_osv(_('Warning'), _('Invoice is already reconciled'))
             wf_service = netsvc.LocalService("workflow")
             res = wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_state_open()
 
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index 3a067b4a598..0e6c38f9d7c 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -31,7 +31,7 @@ class account_unreconcile(osv.osv_memory):
             context = {}
         if context.get('active_ids', False):
             obj_move_line._remove_move_reconcile(cr, uid, context['active_ids'], context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_unreconcile()
 
@@ -46,7 +46,7 @@ class account_unreconcile_reconcile(osv.osv_memory):
         rec_ids = context['active_ids']
         if rec_ids:
             obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_unreconcile_reconcile()
 
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index f840d2b5532..ddcfa2c5353 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -38,7 +38,7 @@ class validate_account_move(osv.osv_memory):
         if not ids_move:
             raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
         obj_move.button_validate(cr, uid, ids_move, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 validate_account_move()
 
@@ -60,7 +60,7 @@ class validate_account_move_lines(osv.osv_memory):
         if not move_ids:
             raise osv.except_osv(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state'))
         obj_move.button_validate(cr, uid, move_ids, context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 validate_account_move_lines()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_accountant/i18n/es.po b/addons/account_accountant/i18n/es.po
index f843d6cf9d7..762fe8effde 100644
--- a/addons/account_accountant/i18n/es.po
+++ b/addons/account_accountant/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-25 22:05+0000\n"
+"PO-Revision-Date: 2010-12-26 08:18+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-26 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_accountant/i18n/sl.po b/addons/account_accountant/i18n/sl.po
index 589644e0136..8eca655f6c4 100644
--- a/addons/account_accountant/i18n/sl.po
+++ b/addons/account_accountant/i18n/sl.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 15:23+0000\n"
-"Last-Translator: Simon Vidmar <Unknown>\n"
+"PO-Revision-Date: 2010-12-26 08:13+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Slovenian <sl@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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index d2ca567be1d..6284c62096d 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/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:43+0000\n"
-"PO-Revision-Date: 2010-12-25 22:11+0000\n"
+"PO-Revision-Date: 2010-12-26 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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
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/es.po b/addons/account_analytic_default/i18n/es.po
index aefbfe8ccce..3d8c0cddaf1 100644
--- a/addons/account_analytic_default/i18n/es.po
+++ b/addons/account_analytic_default/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-25 22:01+0000\n"
+"PO-Revision-Date: 2010-12-26 08:03+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index f484aa15be8..8b06f253971 100644
--- a/addons/account_analytic_default/i18n/fr.po
+++ b/addons/account_analytic_default/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-25 21:35+0000\n"
+"PO-Revision-Date: 2010-12-26 08:03+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
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/es.po b/addons/account_analytic_plans/i18n/es.po
index e76539c12cd..b8754af101f 100644
--- a/addons/account_analytic_plans/i18n/es.po
+++ b/addons/account_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:43+0000\n"
-"PO-Revision-Date: 2010-12-25 22:02+0000\n"
+"PO-Revision-Date: 2010-12-26 07:59+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 8f2b9e7df50..beb5c650f59 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/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-25 21:36+0000\n"
+"PO-Revision-Date: 2010-12-26 07:58+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
index 0581197aaca..1cd3022f60b 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
@@ -53,7 +53,7 @@ class analytic_plan_create_model(osv.osv_memory):
                 'target': 'new',
             }
         else:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 analytic_plan_create_model()
 
diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po
index 172c4fa1c9c..e04b4ca782d 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"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 07: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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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..784dd9367c7 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -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_chart/i18n/es.po b/addons/account_chart/i18n/es.po
index db0712c7240..42d55eb610a 100644
--- a/addons/account_chart/i18n/es.po
+++ b/addons/account_chart/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-25 22:22+0000\n"
+"PO-Revision-Date: 2010-12-26 07: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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/it.po b/addons/account_chart/i18n/it.po
index 506bf55bc07..215ddad0224 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"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 08:00+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:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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_chart/i18n/sl.po b/addons/account_chart/i18n/sl.po
index 768f4314fe8..0a1855cb024 100644
--- a/addons/account_chart/i18n/sl.po
+++ b/addons/account_chart/i18n/sl.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 15:24+0000\n"
-"Last-Translator: Simon Vidmar <Unknown>\n"
+"PO-Revision-Date: 2010-12-26 07:50+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/vi.po b/addons/account_chart/i18n/vi.po
index fa2db777c77..d88c176e668 100644
--- a/addons/account_chart/i18n/vi.po
+++ b/addons/account_chart/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:43+0000\n"
-"PO-Revision-Date: 2010-12-25 22:36+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2010-12-26 07:52+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_coda/i18n/es.po b/addons/account_coda/i18n/es.po
index 55d8d4d5dcb..310e9917385 100644
--- a/addons/account_coda/i18n/es.po
+++ b/addons/account_coda/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-25 22:23+0000\n"
+"PO-Revision-Date: 2010-12-26 07:57+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
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 844522537cb..9193ace3705 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-25 21:48+0000\n"
+"PO-Revision-Date: 2010-12-26 08:12+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-26 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_invoice_layout/i18n/es.po b/addons/account_invoice_layout/i18n/es.po
index ce837fddbcd..4b604da5a23 100644
--- a/addons/account_invoice_layout/i18n/es.po
+++ b/addons/account_invoice_layout/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-25 22:39+0000\n"
+"PO-Revision-Date: 2010-12-26 07: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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index c113bb62d48..7d65d370116 100644
--- a/addons/account_payment/i18n/es.po
+++ b/addons/account_payment/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-25 22:30+0000\n"
+"PO-Revision-Date: 2010-12-26 08: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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index b8328aee333..eb0d8b21926 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -65,7 +65,7 @@ class payment_order_create(osv.osv_memory):
         data = self.read(cr, uid, ids, [], context=context)[0]
         line_ids = data['entries']
         if not line_ids:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
         payment = order_obj.browse(cr, uid, context['active_id'], context=context)
         t = None
@@ -90,7 +90,7 @@ class payment_order_create(osv.osv_memory):
                 'date': date_to_pay,
                 'currency': line.invoice and line.invoice.currency_id.id or False,
                 }, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def search_entries(self, cr, uid, ids, context=None):
         line_obj = self.pool.get('account.move.line')
diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 6627ffaa614..ca9311b1f88 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -37,7 +37,7 @@ class account_payment_make_payment(osv.osv_memory):
 #        obj_act = self.pool.get('ir.actions.act_window')
 #        order = obj_payment_order.browse(cr, uid, context['active_id'], context)
         obj_payment_order.set_done(cr, uid, [context['active_id']], context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 #        t = order.mode and order.mode.type.code or 'manual'
 #        if t == 'manual':
 #            obj_payment_order.set_done(cr,uid,context['active_id'],context)
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index f99189a8444..340ab4bcb03 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -65,7 +65,7 @@ class account_payment_populate_statement(osv.osv_memory):
         data = self.read(cr, uid, ids, [], context=context)[0]
         line_ids = data['lines']
         if not line_ids:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
         statement = statement_obj.browse(cr, uid, context['active_id'], context=context)
 
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 e4b76cc8770..4e08ad9112b 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -847,7 +847,7 @@ class account_voucher_line(osv.osv):
         'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
         'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly=1),
         'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
-        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Originial Amount', store=True),
+        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amount', store=True),
         'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True),
         'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True),
     }
@@ -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 850a338025e..55bb3315d56 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/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:43+0000\n"
-"PO-Revision-Date: 2010-12-21 09:31+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-24 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -25,7 +26,7 @@ msgstr "Transacciones no conciliadas"
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Desajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -139,7 +140,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
@@ -310,6 +311,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
@@ -355,7 +363,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
@@ -470,7 +478,7 @@ msgstr "Importe 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
@@ -478,6 +486,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
@@ -605,7 +615,7 @@ msgstr "Importe 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
@@ -648,7 +658,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 del proveedor"
 
 #. module: account_voucher
 #: help:account.voucher,reference:0
@@ -769,7 +779,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
@@ -838,12 +848,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
@@ -864,7 +874,7 @@ msgstr "Fecha efectiva para entradas 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..85e14fb86f5 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/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-24 09:41+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-27 22:35+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:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -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
@@ -53,16 +52,17 @@ msgstr ""
 #, 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..cef854aa953
--- /dev/null
+++ b/addons/account_voucher/report/account_voucher_sales_receipt.py
@@ -0,0 +1,134 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+import pooler
+from tools import config
+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 fa1a66e0135..f3ce59f7b0b 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -35,15 +35,15 @@ 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:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
         data =  self.read(cr, uid, ids, context=context)[0]
         line_ids = data['line_ids']
         if not line_ids:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
         line_obj = self.pool.get('account.move.line')
         statement_obj = self.pool.get('account.bank.statement')
@@ -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,
@@ -115,7 +115,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                 'voucher_id': voucher_id,
                 'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or,
             }, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_statement_from_invoice_lines()
 
@@ -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/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
index 2bfdfd1ecf8..42a9e1c5ec2 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile.py
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py
@@ -55,7 +55,7 @@ class account_voucher_unreconcile(osv.osv_memory):
 #                wf_service = netsvc.LocalService("workflow")
 #                wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr)
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 account_voucher_unreconcile()
 
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/es.po b/addons/analytic/i18n/es.po
index cfd3a53ecc8..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-09 10:11+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-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -85,6 +85,16 @@ msgid ""
 " If it is to be reviewed then the state is 'Pending'.\n"
 " When the project is completed the state is set to 'Done'."
 msgstr ""
+"* Cuando se crea una cuenta, está en estado 'Borrador'.\n"
+"* Si se asocia a cualquier empresa, puede estar en estado 'Abierta'.\n"
+"* Si existe un saldo pendiente, puede estar en 'Pendiente'.\n"
+"* Y finalmente, cuando todas las transacciones están realizadas, puede estar "
+"en estado de 'Cerrada'.\n"
+"* El proyecto puede estar en los estados 'Plantilla' y 'En proceso.\n"
+"Si es una plantilla, podemos hacer proyectos basados en los proyectos "
+"plantilla. Si está en estado 'En proceso', es un proyecto normal.\n"
+"Si se debe examinar, el estado es 'Pendiente'.\n"
+"Cuando el proyecto se ha completado, el estado se establece en 'Realizado'."
 
 #. module: analytic
 #: field:account.analytic.account,type:0
diff --git a/addons/analytic/i18n/vi.po b/addons/analytic/i18n/vi.po
index 59ee4594d5f..2a789fc6e49 100644
--- a/addons/analytic/i18n/vi.po
+++ b/addons/analytic/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:43+0000\n"
-"PO-Revision-Date: 2010-12-25 22:14+0000\n"
+"PO-Revision-Date: 2010-12-26 08:19+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+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/es.po b/addons/analytic_journal_billing_rate/i18n/es.po
index 3b506251644..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-09 11:43+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-24 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
@@ -33,6 +33,20 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    Este módulo le permite definir el porcentaje de facturación para un "
+"cierto diario en una cuenta dada. Se utiliza principalmente cuando un "
+"usuario codifica su hoja de servicios: los valores son recuperados y los "
+"campos son auto rellenados aunque la posibilidad de cambiar estos valores "
+"está todavía disponible.\n"
+"\n"
+"    Obviamente si no se ha guardado datos para la cuenta actual, se "
+"proporciona el valor por defecto para los datos de la cuenta como siempre "
+"por lo que este módulo es perfectamente compatible con configuraciones "
+"anteriores.\n"
+"\n"
+"    "
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,journal_id:0
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index dd7f5e3be5a..4d7a72247e4 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-27 09:08+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-28 04:42+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/es.po b/addons/analytic_user_function/i18n/es.po
index 6780723410e..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-09 09:34+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-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -31,7 +31,7 @@ msgstr "¡Error!"
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Línea de hoja de servicios"
+msgstr "Línea hoja de servicios"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
@@ -78,6 +78,20 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    Este módulo le permite definir la función por defecto para un cierto "
+"usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
+"codifica su hoja de servicios: los valores son recuperados y los campos son "
+"auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
+"disponible.\n"
+"\n"
+"    Obviamente si no se ha guardado datos para la cuenta actual, se "
+"proporciona el valor por defecto para los datos del empleado como siempre "
+"por lo que este módulo es perfectamente compatible con configuraciones "
+"anteriores.\n"
+"\n"
+"    "
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index e678743840a..52e1d44d796 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"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 08:02+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:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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..a2b1ebcea34 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-27 09:11+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-28 04:43+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/it.po b/addons/association/i18n/it.po
index 62f90696d75..9d4b2553908 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"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 07:49+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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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/association/profile_association.xml b/addons/association/profile_association.xml
index 7b9ddb4ebc3..95e46457cca 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -53,7 +53,14 @@
             <field name="restart">always</field>
       </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9" groups="base.group_extended"/>
+        <menuitem
+            name="Association"
+            id="base.menu_association"
+            icon="terp-calendar"
+            sequence="9"
+            groups="base.group_extended"
+            web_icon="images/association.png"
+            web_icon_hover="images/association-hover.png"/>
         <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
         <menuitem name="Reporting" id="base.menu_report_association" parent="base.menu_association" sequence="20"/>
     </data>
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/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/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/auction/wizard/auction_aie_send.py b/addons/auction/wizard/auction_aie_send.py
index 7c904cf850b..1caec13b852 100644
--- a/addons/auction/wizard/auction_aie_send.py
+++ b/addons/auction/wizard/auction_aie_send.py
@@ -220,7 +220,7 @@ class auction_lots_send_aie(osv.osv_memory):
     def send_pdf(self, cr, uid, ids, context=None):
         threaded_calculation = threading.Thread(target=self._send, args=(cr, uid, ids, context))
         threaded_calculation.start()
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 auction_lots_send_aie()
 
diff --git a/addons/auction/wizard/auction_aie_send_result.py b/addons/auction/wizard/auction_aie_send_result.py
index 5b2b4eca7fd..d6102dd0522 100644
--- a/addons/auction/wizard/auction_aie_send_result.py
+++ b/addons/auction/wizard/auction_aie_send_result.py
@@ -137,7 +137,7 @@ class auction_lots_pay(osv.osv_memory):
         lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context['active_ids'],  ['obj_num','obj_price'])
         args = pickle.dumps(lots)
         self._catalog_send(datas['uname'], datas['password'], datas['dates'], args)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_lots_pay()
 
diff --git a/addons/auction/wizard/auction_lots_able.py b/addons/auction/wizard/auction_lots_able.py
index 369d762727a..8604d691456 100644
--- a/addons/auction/wizard/auction_lots_able.py
+++ b/addons/auction/wizard/auction_lots_able.py
@@ -41,6 +41,6 @@ class auction_lots_able(osv.osv_memory):
         if context is None: 
             context = {}
         self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'ach_emp':True})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_lots_able()
diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py
index 97330f922fe..cc698887afd 100644
--- a/addons/auction/wizard/auction_lots_auction_move.py
+++ b/addons/auction/wizard/auction_lots_auction_move.py
@@ -52,7 +52,7 @@ class auction_lots_auction_move(osv.osv_memory):
         rec_ids =  auction_lots_obj.browse(cr, uid, context.get('active_ids', []))
         for current in self.browse(cr, uid, ids, context=context):
             if not (current.auction_id and len(context.get('active_ids', []))):
-                return {}
+                return {'type': 'ir.actions.act_window_close'}
 
             for rec in rec_ids:
                 new_id = auction_lot_history_obj.create(cr, uid, {
@@ -70,7 +70,7 @@ class auction_lots_auction_move(osv.osv_memory):
                     'sel_inv_id': None,
                     'obj_num': None,
                     'state': 'draft'})
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 auction_lots_auction_move()
 
diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py
index e50f11fd1ec..436d51a66c7 100644
--- a/addons/auction/wizard/auction_lots_buyer_map.py
+++ b/addons/auction/wizard/auction_lots_buyer_map.py
@@ -90,7 +90,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
             for lots in lots_obj.browse(cr, uid, rec_ids, context=context):
                 if lots.ach_login == current.ach_login:
                     lots_obj.write(cr, uid, [lots.id], {'ach_uid': current.ach_uid.id}, context=context)
-        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):
diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py
index 62313315bd9..3974241a071 100644
--- a/addons/auction/wizard/auction_lots_cancel.py
+++ b/addons/auction/wizard/auction_lots_cancel.py
@@ -49,7 +49,7 @@ class auction_lots_cancel(osv.osv):
                     supplier_refund_inv_id = invoice_obj.refund(cr, uid, [lot.ach_inv_id.id])
             if lot.sel_inv_id:
                     customer_refund_inv_id = invoice_obj.refund(cr, uid, [lot.sel_inv_id.id])
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
                 
         _columns = {
         }
diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py
index ed6b8950d2e..290664ba697 100644
--- a/addons/auction/wizard/auction_lots_enable.py
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -38,6 +38,6 @@ class auction_lots_enable(osv.osv_memory):
         if context is None: 
             context = {}
         self.pool.get('auction.lots').write(cr, uid, context.get('active_id',False), {'ach_emp':False})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_lots_enable()
diff --git a/addons/auction/wizard/auction_lots_numerotate.py b/addons/auction/wizard/auction_lots_numerotate.py
index 0712e21565e..22bdac5a67f 100644
--- a/addons/auction/wizard/auction_lots_numerotate.py
+++ b/addons/auction/wizard/auction_lots_numerotate.py
@@ -178,7 +178,7 @@ class auction_lots_numerotate(osv.osv_memory):
         for rec_id in rec_ids:
             lots_obj.write(cr, uid, [rec_id.id], {'obj_num':nbr})
             nbr+=1
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_lots_numerotate()
 
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index dfad93dc759..b914dd1c643 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -100,7 +100,7 @@ class auction_pay_buy(osv.osv_memory):
                         })
                     for lot in lots:
                         lot_obj.write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]})
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 auction_pay_buy()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index 7265a4e7f98..77484bbe988 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -52,6 +52,6 @@ class auction_pay_sel(osv.osv_memory):
             journal_id = datas.get('journal_id', False)
             if lot.sel_inv_id:
                 p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 auction_pay_sel()
diff --git a/addons/auction/wizard/auction_payer_sel.py b/addons/auction/wizard/auction_payer_sel.py
index 808826cfc23..8ad2f5ca019 100644
--- a/addons/auction/wizard/auction_payer_sel.py
+++ b/addons/auction/wizard/auction_payer_sel.py
@@ -29,7 +29,7 @@ class auction_payer(osv.osv_memory):
         if context is None: 
             context = {}
         self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'is_ok':True, 'state':'paid'})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_payer()
 
@@ -50,7 +50,7 @@ class auction_payer_sel(osv.osv_memory):
         if context is None: 
             context = {}
         self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'paid_vnd':True})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 auction_payer_sel()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py
index 8bc0cb8cb5b..f593a36de2e 100644
--- a/addons/auction/wizard/auction_transfer_unsold_object.py
+++ b/addons/auction/wizard/auction_transfer_unsold_object.py
@@ -82,6 +82,6 @@ class auction_transfer_unsold_object(osv.osv):
                                                                                                 'ach_inv_id':None,
                                                                                                 'sel_inv_id':None,
                                                                                                 'state':'draft'})
-            return {}    
+            return {'type': 'ir.actions.act_window_close'}    
         
 auction_transfer_unsold_object()
 \ No newline at end of file
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index 438524db44c..44fe5a30527 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-27 09: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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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 45f36ae20f9..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-09 08:17+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-24 05:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -231,6 +231,14 @@ msgid ""
 "    delete on objects and can check logs.\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo permite al administrador realizar\n"
+"    un seguimiento de todas las operaciones de los\n"
+"    usuarios de todos los objetos del sistema.\n"
+"\n"
+"    El administrador puede definir reglas para leer, escribir\n"
+"    y eliminar objetos y comprobar los registros.\n"
+"    "
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index 2ac31525f2e..34566d51596 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-27 09: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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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/es.po b/addons/base_action_rule/i18n/es.po
index 9cbf679d618..9163cd8aec2 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/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:43+0000\n"
-"PO-Revision-Date: 2010-12-21 08:11+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -427,7 +428,7 @@ msgstr "%(partner_email)s = Email empresa"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_date)s = Creation date"
-msgstr ""
+msgstr "%(object_date)s = Fecha de creación"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
diff --git a/addons/base_calendar/i18n/de.po b/addons/base_calendar/i18n/de.po
index ee344bdd1b6..1c312f301a3 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-27 09:29+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-28 04:43+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/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 48f39e609f9..ea4d5aca85f 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -68,7 +68,7 @@ send an Email to Invited Person')
         model = False
         context_id = context and context.get('active_id', False) or False
         if not context or not context.get('model'):
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
         else:
             model = context.get('model')
 
@@ -89,7 +89,7 @@ send an Email to Invited Person')
                 if context_id:
                     ref = {'ref': '%s,%s' % (model, base_calendar.base_calendar_id2real_id(context_id))}
                 else:
-                    return {}
+                    return {'type': 'ir.actions.act_window_close'}
             if type == 'internal':
                 
                 if not datas.get('user_ids'):
@@ -144,7 +144,7 @@ send an Email to Invited Person')
                 att_obj._send_mail(cr, uid, attendees, mail_to, \
                        email_from = current_user.user_email or tools.config.get('email_from', False))
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule.py b/addons/base_calendar/wizard/base_calendar_set_exrule.py
index 4f5d57235e5..80fe1e44720 100644
--- a/addons/base_calendar/wizard/base_calendar_set_exrule.py
+++ b/addons/base_calendar/wizard/base_calendar_set_exrule.py
@@ -150,7 +150,7 @@ class base_calendar_set_exrule(osv.osv_memory):
                                 + enddate + monthstring + yearstring
 
             model_obj.write(cr, uid, ex_id,{'exrule': exrule_string})
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
         _defaults = {
          'freq': lambda *x: 'None',
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
index a9b0a9f347e..23f67f579f2 100644
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -78,7 +78,7 @@ class calendar_event_edit_all(osv.osv_memory):
                 model = context.get('model', False)
                 model_obj = self.pool.get(model)
                 model_obj.modify_all(cr, uid, [context_id], datas, context=context)
-                return {}
+                return {'type': 'ir.actions.act_window_close'}
 
     _name = "calendar.event.edit.all"
     _description = "Calendar Edit all event"
diff --git a/addons/base_contact/i18n/de.po b/addons/base_contact/i18n/de.po
index 8fb3c8b26d0..ede248cbcbb 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-27 09: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:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+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/es.po b/addons/base_contact/i18n/es.po
index cce3529042a..644b0741a61 100644
--- a/addons/base_contact/i18n/es.po
+++ b/addons/base_contact/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:43+0000\n"
-"PO-Revision-Date: 2010-12-21 08:59+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2010-12-27 22:35+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-28 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -155,6 +156,25 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"        Este módulo le permite gestionar sus contactos de forma completa.\n"
+"\n"
+"    Le permite definir:\n"
+"        *contactos sin ninguna relación con una empresa,\n"
+"        *contactos que trabajan en varias direcciones (probablemente para "
+"distintas empresas),\n"
+"        *contactos con varias funciones para cada una de sus direcciones de "
+"trabajo\n"
+"\n"
+"    También añade nuevas entradas de menús localizadas en:\n"
+"        Empresas \\ Contactos\n"
+"        Empresas \\ Funciones\n"
+"\n"
+"    Tenga cuidado que este módulo convierte las direcciones existentes en "
+"\"direcciones + contactos\". Esto significa que algunos campos de las "
+"direcciones desaparecerán (como el nombre del contacto), ya que se supone "
+"que estarán definidos en otro objeto.\n"
+"    "
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
@@ -512,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/vi.po b/addons/base_contact/i18n/vi.po
index 5b9b212b8e3..1e8dd3b3847 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"
+"PO-Revision-Date: 2010-12-28 04:32+0000\n"
 "Last-Translator: Phong Nguyen <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-28 04:41+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..fb302cd4cd4 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-27 09:47+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-28 04:40+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/es.po b/addons/base_iban/i18n/es.po
index cf2ff5e127c..05e4392c6dd 100644
--- a/addons/base_iban/i18n/es.po
+++ b/addons/base_iban/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:43+0000\n"
-"PO-Revision-Date: 2010-12-21 08:14+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-24 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -65,6 +66,11 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo instala la base para cuentas bancarias IBAN (International Bank "
+"Account Number) y comprueba su validez.\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
diff --git a/addons/base_iban/i18n/sl.po b/addons/base_iban/i18n/sl.po
index df1aa56caa0..fa7d08eab06 100644
--- a/addons/base_iban/i18n/sl.po
+++ b/addons/base_iban/i18n/sl.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 15:25+0000\n"
-"Last-Translator: Simon Vidmar <Unknown>\n"
+"PO-Revision-Date: 2010-12-26 08:13+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:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph.py b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
index 7b04f183129..9f789f0cc7a 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph.py
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
@@ -35,7 +35,7 @@ def _get_graph(self, cr, uid, datas, context=None):
         module_data = mod_obj.get_relation_graph(cr, uid, module.name, context=context)
         if module_data['module_file']:
             mod_obj.write(cr, uid, [module.id], {'file_graph': module_data['module_file']}, context=context)
-    return {}
+    return {'type': 'ir.actions.act_window_close'}
 
 class create_graph(wizard.interface):
     states = {
diff --git a/addons/base_module_quality/i18n/es.po b/addons/base_module_quality/i18n/es.po
index da7531d4a87..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-09 11:45+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-24 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -481,6 +481,9 @@ msgid ""
 "\n"
 "PEP-8 Test , copyright of py files check, method can not call from loops\n"
 msgstr ""
+"\n"
+"Test PEP-8, comprobación del copyright de los ficheros py y que los métodos "
+"no sean llamados desde bucles\n"
 
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
diff --git a/addons/base_module_record/i18n/es.po b/addons/base_module_record/i18n/es.po
index 2df017ef703..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-09 11:15+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-24 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -296,6 +296,29 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo le permite crear un nuevo módulo sin ningún tipo de desarrollo.\n"
+"Graba todas las operaciones sobre los objetos durante la sesión de grabación "
+"y\n"
+"produce un módulo. ZIP. De esta forma puede crear su propio módulo "
+"directamente\n"
+"desde el cliente de OpenERP.\n"
+"\n"
+"Esta versión funciona para crear y actualizar los registros existentes. "
+"Recalcula\n"
+"dependencias y enlaces para todo tipo de widgets (many2one, many2many, "
+"...).\n"
+"También soporta flujos de trabajo y datos de demostración/actualización.\n"
+"\n"
+"Esto le ayudará a crear fácilmente módulos reutilizables y publicables\n"
+"para las configuraciones personalizadas y datos de demostración/prueba.\n"
+"\n"
+"Cómo utilizarlo:\n"
+"Ejecute Administración/Personalización/Creación de módulos/Exportar "
+"personalizaciones como un asistente de módulo.\n"
+"Seleccione la fecha y hora de grabación y los objetos que se grabarán y "
+"Grabar módulo.\n"
+"    "
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/base_module_record/wizard/base_module_record_data.py b/addons/base_module_record/wizard/base_module_record_data.py
index 8071a01ab11..fa9c8a6826e 100644
--- a/addons/base_module_record/wizard/base_module_record_data.py
+++ b/addons/base_module_record/wizard/base_module_record_data.py
@@ -100,7 +100,7 @@ def _record_objects(self, cr, uid, data, context):
         for s_id in search_ids:
              args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
              mod.recording_data.append(('query',args, {}, s_id))
-    return {}
+    return {'type': 'ir.actions.act_window_close'}
 
 def _check(self, cr, uid, data, context):
      pool = pooler.get_pool(cr.dbname)
diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py
index 065e69c171b..9b92a751cdc 100644
--- a/addons/base_module_record/wizard/base_module_record_objects.py
+++ b/addons/base_module_record/wizard/base_module_record_objects.py
@@ -90,7 +90,7 @@ def _record_objects(self, cr, uid, data, context):
         for s_id in search_ids:
              args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
              mod.recording_data.append(('query',args, {}, s_id))
-    return {}
+    return {'type': 'ir.actions.act_window_close'}
 
 def inter_call(self,cr,uid,data,context):
     res=base_module_save._create_module(self,cr, uid, data, context)
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index efa61c556d1..f209bd05526 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -49,7 +49,7 @@ class report_menu_create(osv.osv_memory):
         if context_id:
             data = self.browse(cr, uid, ids, context=context)
             if not data:
-                return {}
+                return {'type': 'ir.actions.act_window_close'}
             data = data[0]
 
             board = obj_board.browse(cr, uid, context_id, context=context)
@@ -77,7 +77,7 @@ class report_menu_create(osv.osv_memory):
                 'action': 'ir.actions.act_window, ' + str(action_id)
                 }, context=context)
             obj_board.write(cr, uid, context_id, {'menu_id': menu_id})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 report_menu_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
index dc7c977e694..0903f968eea 100644
--- a/addons/base_report_creator/wizard/wiz_set_filter_fields.py
+++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
@@ -145,7 +145,7 @@ def _set_filter_value(self, cr, uid, data, context):
                            'condition' : form_data['condition']
                            }
             pooler.get_pool(cr.dbname).get('base_report_creator.report.filter').create(cr,uid,create_dict,context)
-    return {}
+    return {'type': 'ir.actions.act_window_close'}
 
 def _set_form_value(self, cr, uid, data, context):
     field_id = data['form']['field_id']
@@ -199,7 +199,7 @@ def _set_operator(self, cr, uid, data, context):
     elif field.ttype in ('boolean', 'selection'):
         operator.append(('=','Equals'))
         operator.append(('<>','Not Equals'))
-    return {}
+    return {'type': 'ir.actions.act_window_close'}
 
 class set_filter_fields(wizard.interface):
     states = {
diff --git a/addons/base_report_designer/i18n/es.po b/addons/base_report_designer/i18n/es.po
index 3f98af9e592..36f5c8abc67 100644
--- a/addons/base_report_designer/i18n/es.po
+++ b/addons/base_report_designer/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:43+0000\n"
-"PO-Revision-Date: 2010-12-21 09:00+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -57,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"
+"Este módulo se utiliza junto con la extensión OpenERP de OpenOffice.\n"
+"Primero debe instalar la extensión que se encuentra disponible en\n"
+"http://www.openerp.com\n"
+"\n"
+"Este módulo añade asistentes para importar/exportar informes .sxw que\n"
+"puede modificar en OpenOffice. Una vez lo haya modificado, puede\n"
+"cargar el informe con el mismo asistente.\n"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
index 31ce7556bef..913d1cb228b 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-27 22:32+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-28 04:42+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/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_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index 43e2e94121e..f81b2df7a4e 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/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:43+0000\n"
-"PO-Revision-Date: 2010-12-21 09:12+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-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
@@ -207,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
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/es.po b/addons/base_synchro/i18n/es.po
index dbe4bcd7718..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-09 11:37+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-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_synchro
@@ -170,7 +170,7 @@ msgstr "Instancias de sincronización"
 #. module: base_synchro
 #: field:base.synchro.obj,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
diff --git a/addons/board/i18n/es.po b/addons/board/i18n/es.po
index 5ae09692537..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-09 10:14+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-24 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -229,7 +229,7 @@ msgstr "Menú padre"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index a310d388127..6d59db8b08e 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-27 22:43+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-28 04:42+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/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 2b688962265..10d4d80a7f3 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -78,7 +78,7 @@ class board_menu_create(osv.osv_memory):
                 'action': 'ir.actions.act_window,' + str(action_id)
                 }, context=context)
         #End Loop
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     _name = "board.menu.create"
     _description = "Menu Create"
diff --git a/addons/caldav/i18n/es.po b/addons/caldav/i18n/es.po
index 5f0569730a1..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-09 09:27+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-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
@@ -223,6 +223,32 @@ msgid ""
 "created\n"
 "        CALENDAR_NAME: Name of calendar to access\n"
 msgstr ""
+"\n"
+"    Este módulo contiene la funcionalidad básica para un sistema caldav "
+"como:  \n"
+"  - Servidor WebDAV que proporciona acceso remoto al calendario\n"
+"  - Sincronización del calendario utilizando WebDAV\n"
+"  - Evento de calendario personalizado y atributo todo (por hacer) con "
+"cualquier modelo de OpenERP\n"
+"  - Proporciona funcionalidad Importar/Exportar iCal\n"
+"\n"
+"    Para acceder a calendarios usando clientes CalDAV, introduzca en ellos "
+"la dirección:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    Para acceder al calendario OpenERP usando WebCal a un sitio remoto, "
+"introduzca la URL así:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Donde,\n"
+"        HOSTNAME: Host donde el servidor OpenERP (con webdav) se ejecuta\n"
+"        PORT : Puerto donde el servidor OpenERP se ejecuta (por defecto: "
+"8069)\n"
+"        DATABASE_NAME: Nombre de la base de datos donde el calendario "
+"OpenERP se ha creado\n"
+"        CALENDAR_NAME: Nombre del calendario a acceder\n"
 
 #. module: caldav
 #: field:basic.calendar,create_date:0
diff --git a/addons/claim_from_delivery/i18n/es.po b/addons/claim_from_delivery/i18n/es.po
index e451d21c74f..3e3c0a97b15 100644
--- a/addons/claim_from_delivery/i18n/es.po
+++ b/addons/claim_from_delivery/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:43+0000\n"
-"PO-Revision-Date: 2010-11-25 19:34+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-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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 "Reclamación"
 
 #. module: claim_from_delivery
 #: model:ir.module.module,description:claim_from_delivery.module_meta_information
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/es.po b/addons/crm/i18n/es.po
index 24de3cb20a7..83f03f5d4f2 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/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:43+0000\n"
-"PO-Revision-Date: 2010-12-21 08:51+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-24 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -751,7 +752,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Horario de trabajo"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -3317,12 +3318,12 @@ msgstr "Jue"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "    Month-1    "
-msgstr "    Mes 1    "
+msgstr "    Mes-1    "
 
 #. module: crm
 #: help:crm.installer,sale_crm:0
 msgid "This module relates sale from opportunity cases in the CRM."
-msgstr "Este módulo relaciona ventas con oportunidades en la CRM"
+msgstr "Este módulo relaciona ventas con oportunidades en el CRM."
 
 #. module: crm
 #: view:crm.meeting:0
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 e4b228e0bb9..cbe3ec94c20 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -22,8 +22,6 @@
                              <button name="stage_next" string="Next"
                                  states="open,pending" type="object"
                                  icon="gtk-go-forward" />
-                             <field name="section_id"
-                                 invisible="context.get('invisible_section', True)" />
                              <field name="user_id" />
                              <field name="state" />
                              <button name="case_cancel" string="Cancel"
@@ -74,7 +72,7 @@
                     <field name="date" required="1"/>
                     <field name="user_id"/>
                     <field name="section_id" colspan="1" widget="selection" />
-                    <button string="aaaaaaaaaConvert to Opportunity"
+                    <button string="Convert to Opportunity"
                         name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
@@ -94,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_add_note.py b/addons/crm/wizard/crm_add_note.py
index 3c57156a23f..80e6fc6cad2 100644
--- a/addons/crm/wizard/crm_add_note.py
+++ b/addons/crm/wizard/crm_add_note.py
@@ -50,7 +50,7 @@ class crm_add_note(osv.osv_memory):
                 act = 'case_' + obj.state
                 getattr(case_pool, act)(cr, uid, [case.id])
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields, context=None):
         """
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 7fed3cc742c..b8cdb9feb79 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -48,7 +48,7 @@ class crm_lead2opportunity(osv.osv_memory):
         """
         record_id = context and context.get('active_id') or False
         if not record_id:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
         leads = self.pool.get('crm.lead')
         models_data = self.pool.get('ir.model.data')
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 82463c29cf9..dde529b6002 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -108,7 +108,7 @@ class crm_merge_opportunity(osv.osv_memory):
             elif this.state in ['cancel', 'open', 'pending']:
                 act = 'case_' + this.state
                 getattr(opp_obj, act)(cr, uid, [record_id])
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     _columns = {
         'opportunity_ids' : fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
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/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index eeb635b7c3b..3ce5942272d 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -156,7 +156,7 @@ class crm_send_new_email(osv.osv_memory):
                 act = 'case_' + obj.state
                 getattr(case_pool, act)(cr, uid, [case.id])
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields, context=None):
         """
@@ -217,7 +217,7 @@ class crm_send_new_email(osv.osv_memory):
 
             # In the case where the crm.case does not exist in the database
             if not model:
-                return {}
+                return {'type': 'ir.actions.act_window_close'}
 
             model_pool = self.pool.get(model)
             res_id = hist.res_id
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index fcb454e0113..7b2c5fcfcca 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -22,11 +22,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/es.po b/addons/crm_caldav/i18n/es.po
index 00511d19b53..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-11-23 08:43+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-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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"
+"    Nuevos eventos futuros en reuniones:\n"
+"        *  Compartir reuniones con otros clientes de calendario como "
+"sunbird\n"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/crm_caldav/i18n/it.po b/addons/crm_caldav/i18n/it.po
index 7c3f0759018..6606934e772 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"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 12:40+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-28 04:43+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/es.po b/addons/crm_claim/i18n/es.po
index 660ab5539e7..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-09 10:59+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-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
@@ -500,6 +500,14 @@ msgid ""
 "automatically new claims based on incoming emails.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo le permite realizar un seguimiento de las reclamaciones y "
+"urgencias de sus clientes/proveedores.\n"
+"Está totalmente integrado con la pasarela de correo electrónico para que "
+"pueda crear\n"
+"automáticamente las nuevas reclamaciones a partir de los correos "
+"electrónicos entrantes.\n"
+"    "
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
diff --git a/addons/crm_claim/i18n/it.po b/addons/crm_claim/i18n/it.po
index 5cea2f96092..e9b908290de 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-27 21:02+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-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
@@ -31,7 +31,7 @@ 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
@@ -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,7 +63,7 @@ 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
@@ -93,7 +93,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
@@ -168,7 +168,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 +182,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,17 +204,17 @@ 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
@@ -225,18 +225,18 @@ msgstr ""
 #. 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
@@ -253,7 +253,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 +263,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
@@ -281,22 +281,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,7 +306,7 @@ 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
@@ -326,24 +326,24 @@ 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
@@ -353,14 +353,14 @@ msgstr ""
 #. 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
@@ -370,7 +370,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Anno  "
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -385,7 +385,7 @@ 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
@@ -411,7 +411,7 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -422,27 +422,27 @@ 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
@@ -457,12 +457,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 +472,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
@@ -493,7 +493,7 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -540,7 +540,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 +558,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
diff --git a/addons/crm_fundraising/i18n/es.po b/addons/crm_fundraising/i18n/es.po
index c1ac4291aef..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-09 11:18+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-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
@@ -267,7 +267,7 @@ msgstr "Email empleado"
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
diff --git a/addons/crm_helpdesk/i18n/es.po b/addons/crm_helpdesk/i18n/es.po
index 8d35aa879a4..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-09 11:28+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-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -252,7 +252,7 @@ msgstr "Fechas"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index ac0892c40c6..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-09 11:44+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-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_partner_assign
@@ -157,6 +157,11 @@ msgid ""
 "based on geolocalization.\n"
 "    "
 msgstr ""
+"\n"
+"Este es el módulo utilizado por OpenERP SA para redirigir clientes a sus "
+"partners o asesores,\n"
+"basándose en geo-localización.\n"
+"    "
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index fdb7acff35c..64042c8954d 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -198,7 +198,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         to_write.update({'email_cc' : ', '.join(new_cc) })
         case_pool.write(cr, uid, case.id, to_write, context=context)
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def get_lead_details(self, cr, uid, lead_id, context=None):
         body = []
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/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index b52dd6bc8cc..6d9ea99df2e 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/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-20 13:34+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -174,7 +175,7 @@ msgstr "Empresa"
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -407,7 +408,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/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 0e5b243ea29..c0cae6aca28 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-27 18:13+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-28 04:40+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/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index f20426bbc35..f8bb87cf38c 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -113,7 +113,7 @@ class make_delivery(osv.osv_memory):
                     'type': 'make_to_stock'
                 })
     
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 make_delivery()
 
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_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/es.po b/addons/document_ftp/i18n/es.po
index e3f56c916fa..00b41791bbb 100644
--- a/addons/document_ftp/i18n/es.po
+++ b/addons/document_ftp/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-20 13:07+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -55,7 +56,7 @@ msgstr "Imagen"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Dirección"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
diff --git a/addons/document_ics/i18n/es.po b/addons/document_ics/i18n/es.po
index c9d92b51a4f..4eb311b838b 100644
--- a/addons/document_ics/i18n/es.po
+++ b/addons/document_ics/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:51+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\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-24 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -200,6 +201,8 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Le permite sincronizar sus calendarios OpenERP con su teléfono, Outlook, "
+"Sunbird, ical, ..."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id: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/pl.po b/addons/document_webdav/i18n/pl.po
new file mode 100644
index 00000000000..29a50798fd1
--- /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-27 14:21+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-28 04:43+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/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/wizard/event_confirm.py b/addons/event/wizard/event_confirm.py
index 8151c7ae9e9..e21d523bb12 100644
--- a/addons/event/wizard/event_confirm.py
+++ b/addons/event/wizard/event_confirm.py
@@ -30,7 +30,7 @@ class event_confirm(osv.osv_memory):
 
     def confirm(self, cr, uid, ids, context=None):
         self.pool.get('event.event').do_confirm(cr, uid, context.get('event_ids', []), context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 event_confirm()
 
diff --git a/addons/event/wizard/event_confirm_registration.py b/addons/event/wizard/event_confirm_registration.py
index a2fe8170bfd..b122cde02a0 100644
--- a/addons/event/wizard/event_confirm_registration.py
+++ b/addons/event/wizard/event_confirm_registration.py
@@ -63,7 +63,7 @@ class event_confirm_registration(osv.osv_memory):
         registration_pool = self.pool.get('event.registration')
         registration_ids = context.get('registration_ids', [])
         registration_pool.do_open(cr, uid, registration_ids, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 event_confirm_registration()
 
diff --git a/addons/event_project/wizard/event_project_retro.py b/addons/event_project/wizard/event_project_retro.py
index ada9b7fa17b..c7eba5e0ec1 100644
--- a/addons/event_project/wizard/event_project_retro.py
+++ b/addons/event_project/wizard/event_project_retro.py
@@ -76,7 +76,7 @@ class event_project(osv.osv_memory):
                     })
             event_obj.write(cr, uid, [event.id], {'project_id': duplicate_project_id })
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 event_project()
 
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/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/i18n/es.po b/addons/hr/i18n/es.po
index fd42f231a6d..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-25 21:51+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -575,6 +575,13 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"    Módulo para la gestión de recursos humanos. Puede gestionar:\n"
+"    * Empleados y jerarquías: Puede definir su empleado asociado a un "
+"usuario y mostrar jerarquías\n"
+"    * Departamentos RRHH\n"
+"    * Trabajos RRHH\n"
+"    "
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -654,7 +661,7 @@ msgstr "Información personal"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Número de pasaporte"
 
 #. module: hr
 #: view:res.users:0
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index 671c6e9063f..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-25 09:37+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -200,6 +200,11 @@ msgid ""
 "    actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"    Este módulo sirve para gestionar la asistencia de los empleados.\n"
+"    Controla la asistencia de los empleados mediante las acciones\n"
+"    (Registrar entrada/Registrar salida) realizadas por ellos.\n"
+"       "
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
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 4e079584053..ed08ee93174 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -160,7 +160,7 @@ class hr_sign_in_out(osv.osv_memory):
             success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
         except:
             raise osv.except_osv(_('UserError'), _('A sign-in must be right after a sign-out !'))
-        return {} # To do: Return Success message
+        return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
 
     def sign_out(self, cr, uid, data, context=None):
         emp_id = data['emp_id']
@@ -172,7 +172,7 @@ class hr_sign_in_out(osv.osv_memory):
             success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
         except:
             raise osv.except_osv(_('UserError'), _('A sign-out must be right after a sign-in !'))
-        return {} # To do: Return Success message
+        return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
 
 hr_sign_in_out()
 
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/i18n/es.po b/addons/hr_contract/i18n/es.po
index 8eb1ab15336..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-09 09:13+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-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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"
+"    Añade información en el formulario del empleado para gestionar "
+"contratos:\n"
+"    * Estado civil,\n"
+"    * Número Seguridad Social,\n"
+"    * Lugar de nacimiento, fecha de nacimiento, ...\n"
+"    Puede asignar varios contratos por empleado.\n"
+"    "
 
 #. module: hr_contract
 #: view:hr.contract:0
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_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/es.po b/addons/hr_expense/i18n/es.po
index ebbc5cbe09a..29e8ce87c4f 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/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-22 08:16+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-27 16: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-24 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -138,6 +139,21 @@ msgid ""
 "    re-invoice your customer's expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo permite gestionar los gastos de los empleados.\n"
+"\n"
+"    Se ha implementado el flujo completo:\n"
+"    * Gasto en borrador\n"
+"    * Confirmación de la hoja de gastos por el empleado\n"
+"    * Validación por su responsable\n"
+"    * Validación por el contable y creación de la factura\n"
+"    * Pago de la factura al empleado\n"
+"\n"
+"    Este módulo también usas la contabilidad analítica y es compatible con\n"
+"    el módulo de facturación de hojas de servicios de forma que pueda\n"
+"     re-facturar automáticamente sus gastos de clientes si trabaja por "
+"proyectos.\n"
+"    "
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -302,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
@@ -751,7 +767,7 @@ msgstr "Nombre"
 #. module: hr_expense
 #: field:hr.expense.expense,account_move_id:0
 msgid "Ledger Posting"
-msgstr ""
+msgstr "Fijado libro contable"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveinvoice0
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 92334d15c1c..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-25 22:15+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -494,7 +494,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
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/i18n/es.po b/addons/hr_payroll/i18n/es.po
index 0dad94bd62a..17bccc3e742 100644
--- a/addons/hr_payroll/i18n/es.po
+++ b/addons/hr_payroll/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-25 22:31+0000\n"
+"PO-Revision-Date: 2010-12-26 07:59+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
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_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_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..b7a815bf87c 100644
--- a/addons/hr_recruitment/i18n/es.po
+++ b/addons/hr_recruitment/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 08:26+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2010-12-27 18:27+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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_recruitment
@@ -718,12 +719,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
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/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index e5dbecd4ba9..9cfbf0c992c 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-                  parent="base.menu_main_pm" sequence="3"/>
 
         <record id="hr_timesheet_line_tree" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree</field>
@@ -97,8 +94,7 @@
             <field name="help">Through Working Hours you can register your working hours by project every day.</field>
         </record>
 
-    <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-    <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
+        <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index b04553cc030..5b718dc88bc 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -7,13 +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-10-30 14:05+0000\n"
-"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
+"PO-Revision-Date: 2010-12-27 08:06+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:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -307,12 +308,12 @@ msgstr "Septiembre"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Línea de la hoja de asistencia"
+msgstr "Línea hoja de asistencia"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: hr_timesheet
 #: view:account.analytic.account: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/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 596076cf336..90c9a5d7b8c 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -93,7 +93,7 @@ class hr_so_project(osv.osv_memory):
             emp_id = data.emp_id.id
             emp_obj.attendance_action_change(cr, uid, [emp_id], type='sign_out', dt=data.date)
             self._write(cr, uid, data, emp_id, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def sign_out_result(self, cr, uid, ids, context=None):
         emp_obj = self.pool.get('hr.employee')
@@ -101,7 +101,7 @@ class hr_so_project(osv.osv_memory):
             emp_id = data.emp_id.id
             emp_obj.attendance_action_change(cr, uid, [emp_id], type='action', dt=data.date)
             self._write(cr, uid, data, emp_id, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 hr_so_project()
 
@@ -157,7 +157,7 @@ class hr_si_project(osv.osv_memory):
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
             emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields_list, context=None):
         res = super(hr_si_project, self).default_get(cr, uid, fields_list, context=context)
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 54d82ed2c79..fc9226551e3 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -77,6 +77,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/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index ff66e1a2014..a64735df2e3 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"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 07:47+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index 14a3b51672f..be55c83e0fa 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -19,13 +19,6 @@
             <field name="icon">STOCK_JUSTIFY_FILL</field>
             <field name="action" ref="ir_actions_server_timsheet_sheet"/>
         </record>
-        <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
-            <field name="name">My Timesheet</field>
-            <field eval="5" name="sequence"/>
-            <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
-            <field name="icon">STOCK_JUSTIFY_FILL</field>
-            <field name="action" ref="ir_actions_server_timsheet_sheet"/>
-        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 308f794ec0f..4edfbe27fb6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -177,13 +177,6 @@
             <field name="help">Check your timesheets for a specific period. You can also encode time spent on a project (i.e. an analytic account) thus generating costs in the analytic account concerned.</field>
         </record>
 
-        <!--Time Tracking menu in project Management-->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem
-             id="base.menu_project_management_time_tracking"
-             name="Time Tracking"
-             parent="base.menu_main_pm" sequence="5"/>
-
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
              sequence="2"/>
 
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index 90ecfc0d8ea..eed26ff1256 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/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 08:51+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-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -784,7 +784,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Línea de la hoja de servicios"
+msgstr "Línea hoja de servicios"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index aee75447059..9effdd1cb3e 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"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 12:13+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 2c87df69757..8c32cf924e7 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -28,9 +28,5 @@
 
     <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
 
-    <menuitem action="action_hr_timesheet_current_open"
-        id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
-        sequence="5"/>
-
     </data>
 </openerp>
diff --git a/addons/html_view/i18n/es.po b/addons/html_view/i18n/es.po
index b2c81d41a6d..804d9585856 100644
--- a/addons/html_view/i18n/es.po
+++ b/addons/html_view/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-11-29 07:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\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-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
@@ -56,6 +57,10 @@ msgid ""
 "view.\n"
 "    "
 msgstr ""
+"\n"
+"    Este es el módulo de pruebas que muestra el soporte de etiquetas html en "
+"vistas formulario xml normales.\n"
+"    "
 
 #. module: html_view
 #: model:ir.model,name:html_view.model_html_view
diff --git a/addons/idea/i18n/es.po b/addons/idea/i18n/es.po
index a93f040fea2..ecbea70b860 100644
--- a/addons/idea/i18n/es.po
+++ b/addons/idea/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 15:04+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\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-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -71,6 +72,17 @@ msgid ""
 "    The managers can obtain an easy view on best ideas from all the users.\n"
 "    Once installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"\n"
+"    Este módulo permite a sus usuarios participar de forma fácil y eficaz en "
+"la innovación de la empresa.\n"
+"    Permite a todos expresar sus ideas sobre diferentes temas.\n"
+"    Luego, otros usuarios pueden comentar estas ideas y votar a favor de "
+"algunas de las ideas.\n"
+"    Cada idea tiene una puntuación basada en las diferentes votaciones.\n"
+"    Los administradores pueden obtener una visión fácil de las mejores ideas "
+"de todos los usuarios.\n"
+"    Una vez instalado, aparecerá el menú 'Ideas' dentro del menú principal "
+"'Herramientas'."
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
@@ -165,7 +177,7 @@ msgstr "Muy mala"
 #. module: idea
 #: view:idea.vote:0
 msgid "Ideas vote"
-msgstr ""
+msgstr "Voto de ideas"
 
 #. module: idea
 #: view:report.vote:0
@@ -510,12 +522,12 @@ msgstr "Histórico"
 #. module: idea
 #: view:idea.idea:0
 msgid "Vots Statistics"
-msgstr ""
+msgstr "Estadísticas de votos"
 
 #. module: idea
 #: field:report.vote,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Fecha orden"
 
 #. module: idea
 #: view:idea.idea:0
@@ -528,7 +540,7 @@ msgstr "Autor"
 #: view:idea.post.vote:0
 #: model:ir.ui.menu,name:idea.menu_give_vote
 msgid "Give Vote"
-msgstr ""
+msgstr "Dar voto"
 
 #. module: idea
 #: help:idea.idea,vote_limit:0
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index 712f84d4053..b54c007549d 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -126,7 +126,7 @@ class idea_post_vote(osv.osv_memory):
 
             idea_pool._vote_save(cr, uid, vote_id, None, score, context)
             #vote = vote_pool.create(cr, uid, vote)
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 idea_post_vote()
 
diff --git a/addons/knowledge/i18n/es.po b/addons/knowledge/i18n/es.po
index 746e1410ebf..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-11-23 09:38+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-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
@@ -31,7 +31,7 @@ msgstr "Crea un esqueleto de ejemplo para un manual de calidad estándar."
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Share information within the company with these specific Addons."
-msgstr ""
+msgstr "Comparta información con la compañía con estos módulos específicos."
 
 #. module: knowledge
 #: field:knowledge.installer,document_ftp:0
@@ -72,7 +72,7 @@ msgstr ""
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: knowledge
 #: view:knowledge.installer:0
@@ -97,7 +97,7 @@ msgstr "Configuración"
 #. module: knowledge
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 msgid "Knowledge Modules Installation"
-msgstr ""
+msgstr "Instalación de módulos de gestión del conocimiento"
 
 #. module: knowledge
 #: field:knowledge.installer,wiki_quality_manual:0
@@ -131,7 +131,7 @@ msgstr "FAQ internas"
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
 msgid "Collaborative Content"
-msgstr ""
+msgstr "Contenido colaborativo"
 
 #. module: knowledge
 #: field:knowledge.installer,config_logo:0
@@ -151,7 +151,7 @@ msgstr "conocimiento.instalador"
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Configure Your Knowledge Application"
-msgstr ""
+msgstr "Configure su aplicación de gestión del conocimiento"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki:0
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index f6cffce6b12..40075d5bc12 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-27 11: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:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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..677d680fc62
--- /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-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_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..2132e9db54f 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-27 11: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:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index 26630bbdd53..3be42db982f 100644
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -256,7 +256,7 @@ class bvr_import_wizard(osv.osv_memory):
         if res:
             data['form']['file'] = res['file']
         _import(self, cr, uid, data, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 bvr_import_wizard()
 
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/es.po b/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
index ba17b80de46..8bff7f516f0 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-08-31 08:15+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-27 10:57+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:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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
@@ -219,12 +218,12 @@ msgstr "Otros: Ver"
 #. module: l10n_ch_chart_c2c_pcg
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr "Error ! Usted no puede crear plantillas de cuentas recursivas."
+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..132b59af30d 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-27 10:58+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-28 04:42+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..a8368296c5b 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-27 10:16+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-28 04:43+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..512976833d3 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-27 10:47+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-28 04:41+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..2a1fe5325c2
--- /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-27 10:51+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_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_it/report/__init__.py b/addons/l10n_it/report/__init__.py
new file mode 100644
index 00000000000..be32155c675
--- /dev/null
+++ b/addons/l10n_it/report/__init__.py
@@ -0,0 +1,2 @@
+import libroIVA_credito
+import libroIVA_debito
+\ No newline at end of file
diff --git a/addons/l10n_it/report/libroIVA_credito.py b/addons/l10n_it/report/libroIVA_credito.py
new file mode 100644
index 00000000000..b48c81d2475
--- /dev/null
+++ b/addons/l10n_it/report/libroIVA_credito.py
@@ -0,0 +1,79 @@
+import datetime
+import time
+from report import report_sxw
+from osv import osv
+import pooler
+            
+
+class l10n_chart_it_report_libroIVA_credito(report_sxw.rml_parse):
+	
+    def __init__(self, cr, uid, name, context):
+        super(l10n_chart_it_report_libroIVA_credito,self).__init__(cr,uid,name,context)
+        self.localcontext.update({
+            'time' : time,
+	    'get_company' : self.get_company,
+	    'get_periods' : self.get_periods,
+	    'get_lines' : self.get_lines,
+        })
+	
+	
+    def get_company(self,fiscal_year):
+	#print 'COMP = ',fiscal_year
+        return ""
+	
+    def get_periods(self,fiscal_year):
+	#print 'Fiscal year id:',fiscal_year.id
+	obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+	fy=obj.browse(self.cr,self.uid,fiscal_year.id)
+	#print 'Periods = ',fy.period_ids
+	res=[rec for rec in fy.period_ids]
+	#return fy.periods  => non funziona?!? bool object !?!?
+	return res
+	
+    def get_invoices(self,period):
+	#print 'PERIOD = ',period.name
+	obj=pooler.get_pool(self.cr.dbname).get('account.invoice')
+	# Selezione tutte le fatture emesse nel periodo
+	self.cr.execute(	"""
+					SELECT id FROM account_invoice 
+					WHERE 	(state='open' OR state='paid') AND
+							period_id="""+str(period.id)+"""
+							AND (type='out_invoice' OR type='out_refund')
+					""")
+	ids=self.cr.fetchall()
+	#print 'IDS = ',
+	if ids:
+	    ids=[id[0] for id in ids ]
+	invoices=obj.browse(self.cr,self.uid,ids)
+	#print 'INVOICES = ',invoices
+	return invoices
+	
+    def get_lines(self,fiscal_year):
+	res=[]
+	obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+	fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id)
+	for period in fy.period_ids:
+	    invoices=self.get_invoices(period)
+	    for invoice in invoices:
+		d={'periodo': period.name}
+	        d['protocollo']=invoice.number
+		#print 'PARTNER ',invoice.partner_id.name
+		causale=invoice.partner_id.name
+		#print 'CAUSALE = ',causale
+		d['causale']=causale
+		d['numero']=invoice.reference
+		d['data_doc']=invoice.date_invoice
+		for tax in invoice.tax_line:
+		    #print '\tTAX: ',tax
+		    d['aliquota']=tax.tax_code_id.name
+		    d['imponibile']=tax.base
+		    d['imposta']=tax.amount
+		    res.append(d)
+		    d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', }
+	return res
+
+
+        
+report_sxw.report_sxw('report.l10n_it.report.libroIVA_credito','account.report_libroiva',
+                      'l10n_it/report/libroIVA_credito.rml',
+                       parser=l10n_chart_it_report_libroIVA_credito,header=False)
diff --git a/addons/l10n_it/report/libroIVA_credito.rml b/addons/l10n_it/report/libroIVA_credito.rml
new file mode 100644
index 00000000000..2b282f760b4
--- /dev/null
+++ b/addons/l10n_it/report/libroIVA_credito.rml
@@ -0,0 +1,203 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,1" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <blockBackground colorName="#ffcc99" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffcc99" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffcc99" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#ffcc99" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#ffcc99" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#ffcc99" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#ffcc99" start="6,0" stop="6,-1"/>
+      <blockBackground colorName="#ffcc99" start="7,0" stop="7,-1"/>
+      <blockBackground colorName="#ffffff" start="0,1" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,1" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,1" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="3,1" stop="3,-1"/>
+      <blockBackground colorName="#ffffff" start="4,1" stop="4,-1"/>
+      <blockBackground colorName="#ffffff" start="5,1" stop="5,-1"/>
+      <blockBackground colorName="#ffffff" start="6,1" stop="6,-1"/>
+      <blockBackground colorName="#ffffff" start="7,1" stop="7,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" alignment="RIGHT"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="71.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="MP1" fontName="Times-Roman" alignment="RIGHT"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="P2">[[ repeatIn(objects, 'o') ]]</para>
+    <blockTable colWidths="249.0,249.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P10">
+            <font face="Times-Roman" size="10.0">[[ get_company(o) ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="P16">
+            <font face="Times-Roman">REGISTRO IVA </font>
+          </para>
+          <para style="P16">
+            <font face="Times-Roman">VENDITE </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P11">[[ o.name ]] </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="39.0,50.0,92.0,45.0,54.0,76.0,69.0,74.0" repeatRows="1" style="Table2">
+      <tr>
+        <td>
+          <para style="P7">Periodo</para>
+        </td>
+        <td>
+          <para style="P7">Protocollo</para>
+        </td>
+        <td>
+          <para style="P7">Cliente</para>
+        </td>
+        <td>
+          <para style="P7">Numero</para>
+        </td>
+        <td>
+          <para style="P7">Data fattura</para>
+        </td>
+        <td>
+          <para style="P7">Aliquota</para>
+        </td>
+        <td>
+          <para style="P7">Imponibile</para>
+        </td>
+        <td>
+          <para style="P7">Imposta</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P3">[[ repeatIn(get_lines(o), 'line') ]]</para>
+          <para style="P3">[[ line['periodo'] ]]</para>
+        </td>
+        <td>
+          <para style="P3">[[ line['protocollo'] ]]</para>
+        </td>
+        <td>
+          <para style="P3">[[ line['causale'] ]]</para>
+        </td>
+        <td>
+          <para style="P3">[[ line['numero'] ]]</para>
+        </td>
+        <td>
+          <para style="P3">[[ line['data_doc'] ]]</para>
+        </td>
+        <td>
+          <para style="P14">[[ line['aliquota'] ]]</para>
+        </td>
+        <td>
+          <para style="P15">[[ line['imponibile'] ]]</para>
+        </td>
+        <td>
+          <para style="P15">[[ line['imposta'] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P9">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/l10n_it/report/libroIVA_debito.py b/addons/l10n_it/report/libroIVA_debito.py
new file mode 100644
index 00000000000..c7720ab69a1
--- /dev/null
+++ b/addons/l10n_it/report/libroIVA_debito.py
@@ -0,0 +1,80 @@
+import datetime
+import time
+from report import report_sxw
+from osv import osv
+import pooler
+            
+
+class l10n_chart_it_report_libroIVA_debito(report_sxw.rml_parse):
+	
+    def __init__(self, cr, uid, name, context):
+        super(l10n_chart_it_report_libroIVA_debito,self).__init__(cr,uid,name,context)
+        self.localcontext.update({
+            'time' : time,
+	    'get_company' : self.get_company,
+	    'get_periods' : self.get_periods,
+	    'get_lines' : self.get_lines,
+        })
+	
+	
+    def get_company(self,fiscal_year):
+	#print 'COMP = ',fiscal_year
+        return ""
+	
+	
+    def get_periods(self,fiscal_year):
+	#print 'Fiscal year id:',fiscal_year.id
+	obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+	fy=obj.browse(self.cr,self.uid,fiscal_year.id)
+	#print 'Periods = ',fy.period_ids
+	res=[rec for rec in fy.period_ids]
+	#return fy.periods  => non funziona?!? bool object !?!?
+	return res
+	
+    def get_invoices(self,period):
+	#print 'PERIOD = ',period.name
+	obj=pooler.get_pool(self.cr.dbname).get('account.invoice')
+	# Selezione tutte le fatture emesse nel periodo
+	self.cr.execute(	"""
+					SELECT id FROM account_invoice 
+					WHERE 	(state='open' OR state='paid') AND
+							period_id="""+str(period.id)+"""
+							AND (type='in_invoice' OR type='in_refund')
+					""")
+	ids=self.cr.fetchall()
+	#print 'IDS = ',
+	if ids:
+	    ids=[id[0] for id in ids ]
+	invoices=obj.browse(self.cr,self.uid,ids)
+	#print 'INVOICES = ',invoices
+	return invoices
+	
+    def get_lines(self,fiscal_year):
+	res=[]
+	obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+	fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id)
+	for period in fy.period_ids:
+	    invoices=self.get_invoices(period)
+	    for invoice in invoices:
+		d={'periodo': period.name}
+	        d['protocollo']=invoice.number
+		#print 'PARTNER ',invoice.partner_id.name
+		causale=invoice.partner_id.name
+		#print 'CAUSALE = ',causale
+		d['causale']=causale
+		d['numero']=invoice.reference
+		d['data_doc']=invoice.date_invoice
+		for tax in invoice.tax_line:
+		    #print '\tTAX: ',tax
+		    d['aliquota']=tax.tax_code_id.name
+		    d['imponibile']=tax.base
+		    d['imposta']=tax.amount
+		    res.append(d)
+		    d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', }
+	return res
+
+
+        
+report_sxw.report_sxw('report.l10n_it.report.libroIVA_debito','account.report_libroiva',
+                      'l10n_it/report/libroIVA_debito.rml',
+                       parser=l10n_chart_it_report_libroIVA_debito,header=False)
diff --git a/addons/l10n_it/report/libroIVA_debito.rml b/addons/l10n_it/report/libroIVA_debito.rml
new file mode 100644
index 00000000000..ced847722af
--- /dev/null
+++ b/addons/l10n_it/report/libroIVA_debito.rml
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="7,1" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="7,1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <blockBackground colorName="#ffcc99" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffcc99" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffcc99" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#ffcc99" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#ffcc99" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#ffcc99" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#ffcc99" start="6,0" stop="6,-1"/>
+      <blockBackground colorName="#ffcc99" start="7,0" stop="7,-1"/>
+      <blockBackground colorName="#ffffff" start="0,1" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,1" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,1" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="3,1" stop="3,-1"/>
+      <blockBackground colorName="#ffffff" start="4,1" stop="4,-1"/>
+      <blockBackground colorName="#ffffff" start="5,1" stop="5,-1"/>
+      <blockBackground colorName="#ffffff" start="6,1" stop="6,-1"/>
+      <blockBackground colorName="#ffffff" start="7,1" stop="7,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" alignment="RIGHT"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="MP1" fontName="Times-Roman" alignment="RIGHT"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="P7">[[ repeatIn(objects, 'o') ]]</para>
+    <blockTable colWidths="249.0,249.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P10">
+            <font face="Times-Roman" size="10.0">[[ get_company(o) ]]</font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">
+            <font face="Times-Roman">REGISTRO IVA</font>
+          </para>
+          <para style="P12">
+            <font face="Times-Roman">ACQUISTI</font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <para style="P11">[[ o.name ]] </para>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="39.0,50.0,92.0,45.0,54.0,76.0,69.0,74.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+          <para style="P8">Periodo</para>
+        </td>
+        <td>
+          <para style="P8">Protocollo</para>
+        </td>
+        <td>
+          <para style="P8">Fornitore</para>
+        </td>
+        <td>
+          <para style="P8">Numero</para>
+        </td>
+        <td>
+          <para style="P8">Data fattura</para>
+        </td>
+        <td>
+          <para style="P8">Aliquota</para>
+        </td>
+        <td>
+          <para style="P8">Imponibile</para>
+        </td>
+        <td>
+          <para style="P8">Imposta</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P2">[[ repeatIn(get_lines(o), 'line') ]]</para>
+          <para style="P2">[[ line['periodo'] ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ line['protocollo'] ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ line['causale'] ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ line['numero'] ]]</para>
+        </td>
+        <td>
+          <para style="P2">[[ line['data_doc'] ]]</para>
+        </td>
+        <td>
+          <para style="P3">[[ line['aliquota'] ]]</para>
+        </td>
+        <td>
+          <para style="P4">[[ line['imponibile'] ]]</para>
+        </td>
+        <td>
+          <para style="P4">[[ line['imposta'] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/l10n_it/report/normalized_oo2rml.xsl b/addons/l10n_it/report/normalized_oo2rml.xsl
new file mode 100644
index 00000000000..14fcf598e54
--- /dev/null
+++ b/addons/l10n_it/report/normalized_oo2rml.xsl
@@ -0,0 +1,696 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:fo="http://www.w3.org/1999/XSL/Format"
+  xmlns:office="http://openoffice.org/2000/office"
+  xmlns:style="http://openoffice.org/2000/style"
+  xmlns:text="http://openoffice.org/2000/text"
+  xmlns:table="http://openoffice.org/2000/table"
+  xmlns:draw="http://openoffice.org/2000/drawing"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:number="http://openoffice.org/2000/datastyle"
+  xmlns:svg="http://www.w3.org/2000/svg"
+  xmlns:chart="http://openoffice.org/2000/chart"
+  xmlns:dr3d="http://openoffice.org/2000/dr3d"
+  xmlns:math="http://www.w3.org/1998/Math/MathML"
+  xmlns:form="http://openoffice.org/2000/form"
+  xmlns:script="http://openoffice.org/2000/script"
+  office:class="text" office:version="1.0"
+  exclude-result-prefixes = "xsl fo office style text table draw xlink number svg chart dr3d math form script">
+
+  <!--TODO's: indent, picture cache (trml2pdf) -->
+
+<xsl:output method="xml" indent="yes" />
+<xsl:strip-space elements="*"/>
+
+<xsl:key name="text_style" match="style:style[@style:family='text']" use="@style:name" />
+<xsl:key name="page_break_before" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-before='page']" use="@style:name" />
+<xsl:key name="page_break_after" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-after='page']" use="@style:name" />
+<xsl:key name="table_column_style" match="style:style[@style:family='table-column']" use="@style:name" />
+<xsl:key name="table_cell_style" match="style:style[@style:family='table-cell']" use="@style:name" />
+<xsl:key name="paragraph_style" match="style:style[@style:family='paragraph']" use="@style:name" />
+
+<xsl:template match="office:document-content">
+  <document filename="test.pdf">
+    <xsl:apply-templates select="office:automatic-styles" />
+    <xsl:apply-templates select="office:body" />
+  </document>
+</xsl:template>
+
+<xsl:template name="page_size">
+  <xsl:attribute name="pageSize">
+    <xsl:text>(</xsl:text>
+    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+    <xsl:text>,</xsl:text>
+    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
+    <xsl:text>)</xsl:text>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="fixed_frame">
+	<xsl:for-each select="//draw:text-box">
+		<frame>
+			<xsl:attribute name="id"><xsl:value-of select="./@draw:name" /></xsl:attribute>
+			<xsl:attribute name="x1"><xsl:value-of select="./@svg:x" /></xsl:attribute>
+			<xsl:attribute name="y1">
+				<xsl:value-of
+					select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height - ./@svg:y - ./@fo:min-height" />
+			</xsl:attribute>
+			<xsl:attribute name="width">
+				<xsl:value-of select="./@svg:width" />
+			</xsl:attribute>
+			<xsl:attribute name="height">
+				<xsl:value-of select="./@fo:min-height" />
+			</xsl:attribute>
+		</frame>
+	</xsl:for-each>
+</xsl:template>
+
+<xsl:template name="margin_sizes">
+  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
+  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
+  <xsl:variable name="margin_top" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-top" />
+  <xsl:variable name="margin_bottom" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-bottom" />
+  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+  <xsl:variable name="page_height" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
+  <xsl:attribute name="x1"><xsl:value-of select="$margin_left" /></xsl:attribute>
+  <xsl:attribute name="y1"><xsl:value-of select="$margin_bottom" /></xsl:attribute>
+  <xsl:attribute name="width"><xsl:value-of select="$page_width - $margin_left - $margin_right"/></xsl:attribute>
+  <xsl:attribute name="height"><xsl:value-of select="$page_height - $margin_bottom - $margin_top"/></xsl:attribute>
+</xsl:template>
+
+<xsl:template name="text_width">
+  <!-- You need this for the workaround to make primitive outlines-->
+  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
+  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
+  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+  <xsl:value-of select="$page_width - $margin_left - $margin_right - 18"/>
+</xsl:template>
+
+
+
+<xsl:template match="office:automatic-styles">
+  <!--<template pageSize="(21cm, 29.7cm)" leftMargin="1.0cm" rightMargin="2.0cm" topMargin="1.0cm" bottomMargin="1.0cm" title="Test" author="Martin Simon" allowSplitting="20">-->
+  <template pageSize="(21cm, 29.7cm)" title="Test" author="Martin Simon" allowSplitting="20">
+    <xsl:call-template name="page_size" />
+    <pageTemplate id="first">
+	  <xsl:call-template name="fixed_frame" />
+      <frame id="first" x1="2cm" y1="2cm" width="17cm" height="26cm">
+        <xsl:call-template name="margin_sizes" />
+      </frame>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <!--A table style to simulate primitive outlines -till the <addOutline> tag is implemented in trml2pdf -->
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <!--use two standard table grid styles like PyOpenOffice "Old Way": with and without a grid-->
+    <!--TODO insert table cell colors here, not within the <td> tag - otherwise
+         it will not work with flowables as cell content-->
+    <xsl:call-template name="make_blocktablestyle" />
+    <initialize>
+      <paraStyle name="all" alignment="justify" />
+    </initialize>
+    <xsl:apply-templates select="style:style" />
+  </stylesheet>
+</xsl:template>
+
+<xsl:template name="make_blocktablestyle">
+  <xsl:for-each select="//table:table">
+    <xsl:variable name="test">
+      <xsl:value-of select="./@table:name" />
+    </xsl:variable>
+    <xsl:if test="not(boolean(count(preceding-sibling::table:table[@table:name=$test])))">
+      <!--Test if this is the first table with this style, nested tables not counted-->
+      <blockTableStyle id="{@table:name}">
+	    <xsl:if test=".//draw:image">
+	      <blockTopPadding value="0"/>
+	      <blockBottomPadding value="0"/>
+	    </xsl:if>
+        <blockAlignment value="LEFT" />
+        <blockValign value="TOP" />
+        <xsl:call-template name="make_linestyle" />
+        <xsl:call-template name="make_tablebackground" />
+      </blockTableStyle>
+    </xsl:if>
+  </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="make_linestyle">
+	<xsl:for-each select=".//table:table-row">
+		<xsl:variable name="row" select="position() - 1"/>
+		<xsl:for-each select=".//table:table-cell">
+			<xsl:variable name="col" select="position() - 1"/>
+			<xsl:variable name="linebefore">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-left"/>
+			</xsl:variable>
+			<xsl:if test="not($linebefore='') and not($linebefore='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($linebefore,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+			</xsl:if>
+			<xsl:variable name="lineafter">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-right"/>
+			</xsl:variable>
+			<xsl:if test="not($lineafter='') and not($lineafter='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($lineafter,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+			</xsl:if>
+			<xsl:variable name="lineabove">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-top"/>
+			</xsl:variable>
+			<xsl:if test="not($lineabove='') and not($lineabove='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($lineabove,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+			</xsl:if>
+			<xsl:variable name="linebelow">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-bottom"/>
+			</xsl:variable>
+			<xsl:if test="not($linebelow='') and not($linebelow='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($linebelow,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+			</xsl:if>
+			<xsl:variable name="grid">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border"/>
+			</xsl:variable>
+			<xsl:if test="not($grid='') and not($grid='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($grid,'#')"/>
+				</xsl:variable>
+				<!-- Don't use grid because we don't need a line between each rows -->
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+			</xsl:if>
+		</xsl:for-each>
+	</xsl:for-each>
+</xsl:template>
+
+<!-- Was needed to simulate bulleted lists:
+<xsl:template match="text:ordered-list|text:unordered-list">
+  <xsl:variable name = "text_width">
+    <xsl:call-template name="text_width" />
+  </xsl:variable>
+  <blockTable style="Standard_Outline" colWidths="18,{$text_width}">
+  <xsl:apply-templates match="text:list-item" />
+</blockTable>
+</xsl:template>
+
+<xsl:template match="text:list-item">
+  <tr>
+    <td><para><font face="Helvetica-Bold" size="10">*</font></para></td>
+    <td>
+      <xsl:apply-templates />
+    </td>
+  </tr>
+</xsl:template>
+
+-->
+
+
+<xsl:template match="office:body">
+  <story>
+    <xsl:apply-templates />
+	<xsl:for-each select="//draw:text-box">
+		<currentFrame>
+			<xsl:attribute name="name">
+				<xsl:value-of select="./@draw:name" />
+			</xsl:attribute>
+		</currentFrame>
+		<xsl:apply-templates>
+			<xsl:with-param name="skip_draw" select="0" />
+		</xsl:apply-templates>
+		<frameEnd />
+	</xsl:for-each>
+	<xsl:for-each select="//text:ordered-list">
+		<para><seqReset id="{//text:ordered-list/@text:style-name}"/></para>
+	</xsl:for-each>
+  </story>
+</xsl:template>
+
+<xsl:template match="table:table">
+  <blockTable>
+    <xsl:attribute name="colWidths">
+      <xsl:call-template name="make_columns" />
+    </xsl:attribute>
+    <xsl:call-template name="make_tableheaders" />
+    <xsl:attribute name="style">
+      <xsl:value-of select="@table:name" />
+    </xsl:attribute>
+    <xsl:apply-templates />
+  </blockTable>
+</xsl:template>
+
+<xsl:template name="make_tableheaders">
+  <xsl:if test="boolean(count(table:table-header-rows))">
+    <xsl:attribute name="repeatRows">1</xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_tablebackground">
+  <xsl:for-each select=".//table:table-row">
+    <!--Be careful when there are table:table-header-rows as
+         parent node of table:table-row -->
+    <xsl:variable name="row" select="position() - 1" />
+    <xsl:for-each select="./table:table-cell">
+      <xsl:variable name="col" select="position() - 1" />
+      <xsl:variable name="background">
+        <xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:background-color" />
+      </xsl:variable>
+      <xsl:if test="not($background='') and boolean(key('table_cell_style',@table:style-name)/style:properties/@fo:background-color) and starts-with($background,'#')">
+        <!--only RGB hexcolors are accepted -->
+		<blockBackground colorName="{$background}" start="{$col},{$row}" stop="{$col},-1" />
+      </xsl:if>
+     </xsl:for-each>
+   </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="make_columns">
+  <xsl:variable name="columns" >
+    <xsl:for-each select="table:table-column">
+      <xsl:value-of select="key('table_column_style',@table:style-name)/style:properties/@style:column-width" />
+      <xsl:text>,</xsl:text>
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:value-of select="substring($columns,1,string-length($columns) - 1)" />
+  <!--strip the last comma-->
+</xsl:template>
+
+<xsl:template match="table:table-row">
+  <tr>
+    <xsl:apply-templates />
+  </tr>
+</xsl:template>
+
+<xsl:template match="table:table-cell">
+  <td>
+    <xsl:apply-templates />
+  </td>
+</xsl:template>
+
+<xsl:template match="text:section">
+  <section>
+    <xsl:apply-templates />
+  </section>
+</xsl:template>
+
+
+<xsl:template match="text:span">
+  <font>
+    <xsl:call-template name="make_fontnames_span" />
+    <xsl:call-template name="make_fontsize_span" />
+    <xsl:apply-templates />
+  </font>
+</xsl:template>
+
+<xsl:template name="make_fontsize_span">
+  <xsl:variable name ="fontsize">
+    <xsl:value-of select="key('text_style',@text:style-name)/style:properties/@fo:font-size" />
+  </xsl:variable>
+  <xsl:if test="not($fontsize='') and boolean(key('text_style',@text:style-name)/style:properties/@fo:font-size)" >
+    <xsl:attribute name="size">
+      <xsl:value-of select="$fontsize" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontnames_span">
+  <xsl:attribute name="face">
+    <xsl:call-template name="make_fontnames">
+      <xsl:with-param name="fontName" select="key('text_style',@text:style-name)/style:properties/@style:font-name"  />
+      <xsl:with-param name="fontWeight" select="key('text_style',@text:style-name)/style:properties/@fo:font-weight"  />
+      <xsl:with-param name="fontStyle" select="key('text_style',@text:style-name)/style:properties/@fo:font-style" />
+    </xsl:call-template>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="make_image">
+  <illustration height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}">
+    <image x="0" y="0" file="{substring-after(.//draw:image/@xlink:href,'#Pictures/')}" height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}" />
+  </illustration>
+</xsl:template>
+
+<xsl:template name="empty_paragraph">
+  <xsl:if test="not(boolean(count(descendant::node())))">
+    <xsl:call-template name="distance_point">
+      <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
+    </xsl:call-template>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="distance_point">
+  <xsl:param name="background" />
+  <xsl:param name="tab_stop"></xsl:param>
+  <xsl:variable name="local_back">
+    <xsl:choose>
+      <xsl:when test="not(boolean($background)) or not(contains($background,'#'))">
+        <!-- Do not accept OO colors like "transparent", only hex-colors -->
+        <xsl:text>white</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$background" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <font color="{$local_back}">
+    <xsl:text> </xsl:text>
+    <xsl:if test="boolean($tab_stop)">
+      <!-- simulate a tabstop with white/background-color points -->
+      <xsl:text>.........</xsl:text>
+    </xsl:if>
+  </font>
+</xsl:template>
+
+<xsl:template match="text:ordered-list">
+  <xsl:apply-templates />
+
+  <!-- Reset the counter. seqreset is not a trml2pdf tag, but a Platypus Intra Paragraph Markup,
+       so it needs a dummy paragraph to enclose it -->
+</xsl:template>
+
+<xsl:template name="make_listitem">
+  <xsl:if test="(name(..)='text:list-item')">
+    <xsl:attribute name="leftIndent">15</xsl:attribute>
+    <xsl:attribute name="bulletIndent">0</xsl:attribute>
+    <xsl:choose>
+      <xsl:when test="(name(../..)='text:unordered-list')">
+        <xsl:variable name="fontsize">
+          <xsl:value-of select="number(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)" />
+        </xsl:variable>
+        <xsl:choose>
+          <xsl:when test="$fontsize='NaN'">
+            <!-- you should exclude non-numerical values for bulletFontSize. <== Sometimes the preprocessing went wrong.-->
+            <!--use a default bullet font size-->
+            <xsl:attribute name="bulletFontSize">6</xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="bulletFontSize"><xsl:value-of select="floor(($fontsize div 2) + 1)" /></xsl:attribute>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:attribute name="bulletFontName">ZapfDingbats</xsl:attribute>
+        <xsl:attribute name="bulletText">l</xsl:attribute>
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- Generate the numbers for an ordered list -->
+        <xsl:variable name="size">
+          <xsl:value-of select="key('paragraph_style',@text:style-name)/style:properties/@fo:font-size" />
+        </xsl:variable>
+        <!-- For ordered lists we use the bullet tag from Platypus Intra Paragraph Markup -->
+        <bullet>
+          <xsl:if test="not($size='') and boolean(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)">
+            <xsl:attribute name="size">
+              <!-- adapt the fontsize to the fontsize of the current paragraph -->
+              <xsl:value-of select="$size" />
+            </xsl:attribute>
+          </xsl:if>
+          <seq id="{../../@text:style-name}"/>.</bullet>
+
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="text:drop-down">
+    <xsl:value-of select="text:label[2]/@text:value" />
+</xsl:template>
+
+
+<xsl:template match="text:p|text:h">
+	<xsl:param name="skip_draw" select="1" />
+  <xsl:if test="boolean(key('page_break_before',@text:style-name))" >
+    <pageBreak />
+  </xsl:if>
+  <xsl:choose>
+    <xsl:when test="boolean(.//draw:image)">
+      <xsl:call-template name="make_image" />
+    </xsl:when>
+	<xsl:when test="boolean(name(..) = 'draw:text-box') and boolean($skip_draw)">
+	</xsl:when>
+    <xsl:otherwise>
+      <para>
+        <xsl:attribute name="style">
+          <xsl:value-of select="@text:style-name" />
+        </xsl:attribute>
+        <xsl:call-template name="make_listitem" />
+        <xsl:apply-templates />
+        <xsl:call-template name="empty_paragraph" />
+      </para>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:if test="boolean(key('page_break_after',@text:style-name))" >
+    <pageBreak />
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="text:p/text:tab-stop">
+  <!-- simulate a tabstop -->
+  <xsl:call-template name="distance_point">
+    <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
+    <xsl:with-param name="tab_stop">yes</xsl:with-param>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- experimental - switched off
+<xsl:template match="text:h">
+  <para>
+    <xsl:attribute name="style">
+      <xsl:value-of select="@text:style-name" />
+    </xsl:attribute>
+    <xsl:call-template name="make_number" />
+    <xsl:apply-templates />
+    <xsl:call-template name="empty_paragraph" />
+  </para>
+</xsl:template>
+
+<xsl:template name="make_number">
+  <xsl:choose>
+    <xsl:when test="@text:level='1'">
+      <xsl:number format="1. " />
+    </xsl:when>
+    <xsl:when test="@text:level='2'">
+      <xsl:number count="text:h[@text:level='1']|text:h[text:level='2']" level="any" format="1.1." />
+    </xsl:when>
+  </xsl:choose>
+</xsl:template>
+
+-->
+
+<xsl:template match="style:style[@style:family='paragraph']">
+  <paraStyle>
+    <xsl:attribute name="name">
+      <xsl:value-of select="@style:name" />
+    </xsl:attribute>
+    <xsl:call-template name="make_indent_paragraph" />
+    <xsl:call-template name="make_fontnames_paragraph" />
+    <xsl:call-template name="make_fontsize" />
+    <!--<xsl:call-template name="make_parent" /> not necessary -
+         parent styles processed by PyOpenOffice -->
+    <xsl:call-template name="make_alignment" />
+    <xsl:call-template name="make_background" />
+    <xsl:call-template name="make_space_beforeafter" />
+    <xsl:call-template name="make_fontcolor" />
+  </paraStyle>
+</xsl:template>
+
+<xsl:template name="make_indent_paragraph">
+  <xsl:variable name="right_indent"><xsl:value-of select="style:properties/@fo:margin-right" /></xsl:variable>
+  <xsl:variable name="left_indent"><xsl:value-of select="style:properties/@fo:margin-left" /></xsl:variable>
+  <xsl:if test="not($right_indent='') and boolean(style:properties/@fo:margin-right)">
+    <xsl:attribute name="rightIndent">
+      <xsl:value-of select="$right_indent" />
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="not($left_indent='') and boolean(style:properties/@fo:margin-left)">
+    <xsl:attribute name="leftIndent">
+      <xsl:value-of select="$left_indent" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_background">
+  <xsl:variable name="background">
+    <xsl:value-of select="style:properties/@fo:background-color" />
+  </xsl:variable>
+  <xsl:if test="not($background='') and boolean(style:properties/@fo:background-color) and starts-with($background,'#')" >
+    <xsl:attribute name="backColor">
+      <xsl:value-of select="$background" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_space_beforeafter">
+  <xsl:variable name="before">
+    <xsl:value-of select="style:properties/@fo:margin-top" />
+  </xsl:variable>
+  <xsl:variable name="after">
+    <xsl:value-of select="style:properties/@fo:margin-bottom" />
+  </xsl:variable>
+  <xsl:if test="not($before='') and boolean(style:properties/@fo:margin-top)" >
+    <xsl:attribute name="spaceBefore">
+      <xsl:value-of select="$before" />
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="not($after='') and boolean(style:properties/@fo:margin-bottom)" >
+    <xsl:attribute name="spaceAfter">
+      <xsl:value-of select="$after" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontsize">
+  <xsl:variable name="fontSize">
+    <xsl:value-of select="style:properties/@fo:font-size" />
+  </xsl:variable>
+  <xsl:if test="not($fontSize='') and boolean(style:properties/@fo:font-size)">
+    <xsl:attribute name="fontSize">
+      <xsl:value-of select="$fontSize" />
+    </xsl:attribute>
+    <xsl:attribute name="leading">
+      <xsl:value-of select="$fontSize + floor($fontSize div 5) + 1" />
+      <!--use a standard leading related to the font size -->
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--this template is not needed anymore for "normalized" sxw files -->
+<xsl:template name="make_parent">
+  <xsl:variable name="parent">
+    <xsl:value-of select="@style:parent-style-name" />
+  </xsl:variable>
+  <xsl:if test="not($parent='') and boolean(@style:parent-style-name)">
+    <xsl:attribute name="parent">
+      <xsl:value-of select="$parent" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_alignment">
+  <xsl:variable name="alignment">
+    <xsl:value-of select="style:properties/@fo:text-align" />
+  </xsl:variable>
+  <xsl:if test="not($alignment='') and boolean(style:properties/@fo:text-align)">
+    <xsl:choose>
+      <xsl:when test="$alignment='start'">
+        <xsl:attribute name="alignment">LEFT</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='center'">
+        <xsl:attribute name="alignment">CENTER</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='end'">
+        <xsl:attribute name="alignment">RIGHT</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='justify'">
+        <xsl:attribute name="alignment">JUSTIFY</xsl:attribute>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontnames_paragraph">
+  <xsl:attribute name="fontName">
+    <xsl:call-template name="make_fontnames">
+      <xsl:with-param name="fontName" select="style:properties/@style:font-name" />
+      <xsl:with-param name="fontWeight" select="style:properties/@fo:font-weight" />
+      <xsl:with-param name="fontStyle" select="style:properties/@fo:font-style" />
+    </xsl:call-template>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="make_fontnames">
+  <!--much too verbose, needs improvement-->
+<xsl:param name="fontName" />
+<xsl:param name="fontWeight" />
+<xsl:param name="fontStyle" />
+<xsl:choose>
+<xsl:when test="not($fontName='') and boolean($fontName)">
+  <xsl:choose>
+    <xsl:when test="contains($fontName,'Courier')">
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Courier-BoldOblique</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Courier-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Courier-Oblique</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Courier</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:when test="contains($fontName,'Helvetica') or contains($fontName,'Arial') or contains($fontName,'Sans')">
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Helvetica-BoldOblique</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Helvetica-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Helvetica-Oblique</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Helvetica</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Times-BoldItalic</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Times-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Times-Italic</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Times-Roman</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:when>
+<xsl:otherwise>
+  <!--Use this as default -->
+  <xsl:text>Times-Roman</xsl:text>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+<xsl:template name="make_fontcolor">
+  <xsl:variable name="textColor">
+    <xsl:value-of select="style:properties/@fo:color"/>
+  </xsl:variable>
+  <xsl:if test="not($textColor='') and boolean(style:properties/@fo:color)">
+  <xsl:attribute name="textColor">
+      <xsl:value-of select="$textColor" />
+   </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--
+This stylesheet is part of:
+PyOpenOffice Version 0.4
+Copyright (C) 2005: Martin Simon
+Homepage: www.bezirksreiter.de
+
+GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
+-->
+
+</xsl:stylesheet>
+
+
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..c79984c7171
--- /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-27 11:04+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_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..5379ec01688 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-27 10:50+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-28 04:43+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/mail_gateway/i18n/pl.po b/addons/mail_gateway/i18n/pl.po
new file mode 100644
index 00000000000..baf531f2a04
--- /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-27 14:33+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-28 04:43+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..879d3d37029 100755..100644
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
diff --git a/addons/marketing/i18n/es.po b/addons/marketing/i18n/es.po
index f72266ba9a0..b0ba14437fd 100644
--- a/addons/marketing/i18n/es.po
+++ b/addons/marketing/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-22 18:43+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\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-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
@@ -116,7 +117,7 @@ msgstr ""
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure"
-msgstr "Configure"
+msgstr "Configurar"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 8b804487e77..c6c8c6e6946 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,7 +2,15 @@
 <openerp>
     <data>
 
-        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
+        <menuitem
+            name="Marketing"
+            icon="terp-crm"
+            id="base.marketing_menu"
+            sequence="17"
+            groups="marketing.group_marketing_user,marketing.group_marketing_manager"
+            web_icon="images/marketing.png"
+            web_icon_hover="images/marketing-hover.png"/>
+
 
         <record id="view_marketing_installer" model="ir.ui.view">
             <field name="name">marketing.installer.view</field>
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index 0a808c43453..f37c21c3020 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-25 21:46+0000\n"
+"PO-Revision-Date: 2010-12-27 22:57+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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/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/es.po b/addons/mrp/i18n/es.po
index af46ba9b0c7..a911033e9b3 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/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 10:16+0000\n"
+"PO-Revision-Date: 2010-12-27 17:45+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:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -105,7 +105,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 +128,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 +246,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 +524,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 +534,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 +586,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 +784,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 +839,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 +868,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
@@ -949,7 +957,7 @@ msgstr "Producto almacenable"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Work Center name"
-msgstr "Nombre del centro de producción"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -1093,7 +1101,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 +1136,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 +1181,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 +1400,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 +1515,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 +1529,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 +1571,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 +1772,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 +1874,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 +1949,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 +2061,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 +2181,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 +2326,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 +2459,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 +2482,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 +2564,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..7a591e6e6bd 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-27 15:12+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:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+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..b001c722fef 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,26 @@
 "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
+"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/mrp_jit/i18n/es.po b/addons/mrp_jit/i18n/es.po
index ffbed9c7cf4..e3071e46506 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-27 12:46+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-28 04:42+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/es.po b/addons/mrp_operations/i18n/es.po
index 577aa83d2c2..913209db02c 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-27 17:44+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-28 04:42+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_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index 534b367be5b..9f90b152daa 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-27 12:06+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-28 04:42+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/es.po b/addons/multi_company/i18n/es.po
index 8f6b87afd2d..f30a95cbc83 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-27 12: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-28 04:43+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/es.po b/addons/outlook/i18n/es.po
index da30de13d4f..102c5e311c8 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-27 18:48+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: 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..2861404831d
--- /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-27 14:11+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-28 04:43+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/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 2ef966b2a43..c57c5287692 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-27 23:05+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-28 04:40+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
@@ -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/es.po b/addons/process/i18n/es.po
index f13f274ac5c..b21ace7968f 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-27 12:08+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-28 04:41+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/es.po b/addons/procurement/i18n/es.po
index 5763582098b..c125550766e 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-27 18: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-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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 a6c640e70bf..8bb9d5c7897 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 03:38+0000\n"
+"PO-Revision-Date: 2010-12-27 06:22+0000\n"
 "Last-Translator: Phong Nguyen <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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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/product/i18n/es.po b/addons/product/i18n/es.po
index 9b7cd9ac546..2e8c50ffe89 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -7,13 +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-16 17:20+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 18:02+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:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -155,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
@@ -489,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
@@ -503,7 +508,7 @@ msgstr "Ventas & Compras"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
 msgid "Working Time"
-msgstr "Tiempo trabajo"
+msgstr "Horario de trabajo"
 
 #. module: product
 #: help:product.product,active:0
@@ -706,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
@@ -718,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
@@ -1218,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
@@ -1370,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
@@ -1809,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
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index 502cfcca3e1..7c027cf0886 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.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:12+0000\n"
+"PO-Revision-Date: 2010-12-26 07:53+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@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-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index 2ddf87d94c9..f4fd3c04ac0 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-27 15:15+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-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -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
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/pricelist.py b/addons/product/pricelist.py
index 1468cd45200..ad11edff47c 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -541,7 +541,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/vi.po b/addons/product_expiry/i18n/vi.po
index da1e172c400..6eb7bbbddcf 100644
--- a/addons/product_expiry/i18n/vi.po
+++ b/addons/product_expiry/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-25 08:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-26 08:19+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-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -174,3 +174,6 @@ msgstr ""
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
 msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML không hợp lệ cho Kiến trúc Xem!"
diff --git a/addons/product_manufacturer/security/ir.model.access.csv b/addons/product_manufacturer/security/ir.model.access.csv
index 6f07fb1dc94..c12946db678 100644
--- a/addons/product_manufacturer/security/ir.model.access.csv
+++ b/addons/product_manufacturer/security/ir.model.access.csv
@@ -1,3 +1,6 @@
 "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 sale_manager","product.manufacturer.attribute","model_product_manufacturer_attribute","base.group_sale_manager",1,1,1,1
+"access_product_manufacturer_attribute_purchasemanager","product.manufacturer.attribute purchasemanager","model_product_manufacturer_attribute","purchase.group_purchase_manager",1,1,1,1
+"access_product_manufacturer_attribute_stockmanager","product.manufacturer.attribute stockmanager","model_product_manufacturer_attribute","stock.group_stock_manager",1,1,1,1
+"access_product_manufacturer_attribute_mrpmanager","product.manufacturer.attribute mrpmanager","model_product_manufacturer_attribute","mrp.group_mrp_manager",1,1,1,1
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index a4d55aa1c22..74c15809aa3 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-27 12: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-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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..00ec98ab1e0 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" groups="base.group_sale_salesman,base.group_sale_manager,purchase.group_purchase_manager,stock.group_stock_manager,mrp.group_mrp_manager"/>
 
 </data>
 </openerp>
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
index cb9cf4fcf6b..148bb2b611d 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-27 18: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-28 04:43+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 b7565774df0..9c21d0bcd0e 100644
--- a/addons/profile_tools/i18n/es.po
+++ b/addons/profile_tools/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 13:30+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-27 18: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-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_tools
@@ -49,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
@@ -74,12 +77,12 @@ msgstr ""
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "Configure"
-msgstr "Configura"
+msgstr "Configurar"
 
 #. module: profile_tools
 #: help:misc_tools.installer,survey:0
 msgid "Allows you to organize surveys."
-msgstr "Le permite organizar encuestas"
+msgstr "Le permite organizar encuestas."
 
 #. module: profile_tools
 #: model:ir.module.module,shortdesc:profile_tools.module_meta_information
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index c727123e2cc..aa67fd89b25 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-27 18: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-24 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+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..2fe7bb2b0b9 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-27 18: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-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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_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 f206216b677..2574ee627f0 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-04 09:45+0000\n"
+"PO-Revision-Date: 2010-12-27 18: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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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
@@ -40,7 +44,7 @@ msgstr "Proyecto de hoja de existencia"
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Línea de hoja de asistencia"
+msgstr "Línea hoja de servicios"
 
 #. module: project_issue_sheet
 #: view:project.issue:0
diff --git a/addons/project_mailgate/i18n/es.po b/addons/project_mailgate/i18n/es.po
index b217445f938..d85ac14e12c 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-27 18: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:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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..fc6b0a3f9b2 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-27 18: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-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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_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..1cb56aa94a4 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-27 18:32+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-28 04:42+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_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index fbf3d389739..e0defdb7e07 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -31,7 +31,7 @@
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
-    'init_xml': [],
+    'init_xml': ['project_timesheet_data.xml'],
     'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
     'demo_xml': ["project_timesheet_demo.xml"],
     'test': [
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index f14ccc27de6..92b3f6d7042 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"
+"PO-Revision-Date: 2010-12-27 14:37+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:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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/project_timesheet/project_timesheet_data.xml b/addons/project_timesheet/project_timesheet_data.xml
new file mode 100644
index 00000000000..59a25c142b5
--- /dev/null
+++ b/addons/project_timesheet/project_timesheet_data.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+    
+        <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
+            <field name="name">Time Tracking</field>
+            <field eval="5" name="sequence"/>
+            <field name="parent_id" ref="base.menu_main_pm"/>
+        </record>
+
+        <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
+            <field name="name">My Timesheet</field>
+            <field eval="5" name="sequence"/>
+            <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
+            <field name="icon">STOCK_JUSTIFY_FILL</field>
+            <field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
+        </record>
+    
+    </data>
+</openerp>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index b0a898dac3b..6b2f844338f 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -133,7 +133,12 @@
                   parent="base.menu_main_pm" sequence="5"/>
         <menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
             parent="menu_project_billing" action="action_project_timesheet_bill_task"/>
-        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-                parent="base.menu_main_pm" sequence="5"/>
+            
+        <!--
+            Time Tracking menu in project Management
+        -->
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
+        <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="hr_timesheet.act_hr_timesheet_line_evry1_all_form"/>
+        
     </data>
 </openerp>
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index f66d769891a..cf3c9ea2e45 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-27 22:30+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-28 04:40+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
@@ -1168,6 +1176,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 +1466,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
@@ -1709,7 +1724,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 +1775,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/i18n/it.po b/addons/purchase/i18n/it.po
index 7a09bf6bf65..28a11cc72b2 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/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:45+0000\n"
-"PO-Revision-Date: 2010-12-25 21:58+0000\n"
-"Last-Translator: Roberto Onnis <Unknown>\n"
+"PO-Revision-Date: 2010-12-26 07:58+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:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
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_analytic_plans/i18n/es.po b/addons/purchase_analytic_plans/i18n/es.po
index f2f94bf2341..d50d57ec562 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-27 18: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 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+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/report_designer/i18n/es.po b/addons/report_designer/i18n/es.po
index 823e73c7400..1bff501da60 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-27 18:58+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-28 04:43+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..c8aead6e999 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-27 18:59+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-28 04:41+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..f1a72c60072 100644
--- a/addons/report_intrastat/security/ir.model.access.csv
+++ b/addons/report_intrastat/security/ir.model.access.csv
@@ -1,4 +1,7 @@
 "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
+"access_report_intrastat_code_mrp_manager","report.intrastat.code mrp manager","model_report_intrastat_code","mrp.group_mrp_manager",1,1,1,1
diff --git a/addons/report_webkit/i18n/pl.po b/addons/report_webkit/i18n/pl.po
new file mode 100644
index 00000000000..c2ad43f223c
--- /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-27 14:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-28 04:43+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_sample/i18n/es.po b/addons/report_webkit_sample/i18n/es.po
index a4149f2306a..5560364ad53 100644
--- a/addons/report_webkit_sample/i18n/es.po
+++ b/addons/report_webkit_sample/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-25 21:51+0000\n"
+"PO-Revision-Date: 2010-12-26 08: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-26 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit_sample
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index 8e0c8c91ef0..258183634a2 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-27 19: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:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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..97aaecbc18e 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-27 13:49+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-28 04:42+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 3955feade15..f0df9f0f627 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-25 21:56+0000\n"
+"PO-Revision-Date: 2010-12-27 23: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-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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_analytic_plans/i18n/es.po b/addons/sale_analytic_plans/i18n/es.po
index 14a8c34932e..46241731c70 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-27 19:06+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-28 04:42+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..cbf406fd5f0 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-27 19:44+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-28 04:41+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..a7db87a8960 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-27 14:13+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:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:41+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_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index b6c0da123f4..978a563cc5a 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-27 19: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-24 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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
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..206513e6ce0 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-27 19:39+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-28 04:43+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..94b10c8ebf9 100755..100644
--- a/addons/sale_layout/report/report_sale_layout.py
+++ b/addons/sale_layout/report/report_sale_layout.py
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..8156057fcc7 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-27 19: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:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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..3c47c3ad034 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-27 19: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-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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..78022a6897a 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-27 13:55+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-28 04:43+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_order_dates/i18n/es.po b/addons/sale_order_dates/i18n/es.po
index 581b033f126..92f12265cbc 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-27 19:18+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-28 04:43+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..3b48d0222e4
--- /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-27 13:58+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-28 04:43+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/stock/i18n/es.po b/addons/stock/i18n/es.po
index 6c8f923af24..a98a070e63f 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-27 19: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:01+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+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..4d4de633411 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"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-27 17:10+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:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:40+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_invoice_directly/i18n/es.po b/addons/stock_invoice_directly/i18n/es.po
index b6acc233195..85499a40376 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-27 18: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:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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_location/i18n/es.po b/addons/stock_location/i18n/es.po
index 69b34bc2b99..951927bf874 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-27 18: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:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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..a50f18a493c 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -1,12 +1,19 @@
 "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_purchase_manager","product_pulled_flow purchase manager","model_product_pulled_flow","purchase.group_purchase_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_product_pulled_flow_mrp_manager","product_pulled_flow mrp manager","model_product_pulled_flow","mrp.group_mrp_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_purchase_manager","stock.location.path purchase manager","model_stock_location_path","purchase.group_purchase_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_mrp_manager","stock.location.path mrp manager","model_stock_location_path","mrp.group_mrp_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/survey/i18n/es.po b/addons/survey/i18n/es.po
index a89de0de4cb..26cd1c4b618 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-27 20: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:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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..1abc6106ffa 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-27 18:48+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-28 04:43+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..6ff40a09221 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-27 10: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:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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..efb8d94455c
--- /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-27 14:13+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-28 04:43+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..2ef3562f3c7 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-27 18: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-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+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 2ec7a5a6e61..0a85f4c097a 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/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:45+0000\n"
-"PO-Revision-Date: 2010-12-16 17:23+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\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-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -167,7 +166,7 @@ msgstr ""
 #: code:addons/warning/warning.py:0
 #, python-format
 msgid "Alert for %s !"
-msgstr ""
+msgstr "Aleret pour %s !"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
@@ -220,12 +219,12 @@ msgstr "Partenaire"
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Commande de vente"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Ligne de commande de vente"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/wiki/i18n/es.po b/addons/wiki/i18n/es.po
index c4f223ccb7e..eab4b0cf288 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-27 10:43+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-28 04:42+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..e337fc9fdff 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'
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 1fe4f8acc49..d2458c796ff 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -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..c05f2f4f4e7 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-27 10: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:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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..b0bed5c7fe2 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-27 10: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:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-28 04:43+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!"
author	jam-openerp <jam@tinyerp.com>	2010-12-29 14:28:50 +0530
committer	jam-openerp <jam@tinyerp.com>	2010-12-29 14:28:50 +0530
commit	283ccb7cb7ea08bb1d97be53d34ef86e1c2ca3d1 (patch)
tree	5e4461435eaea37121c599e6f5af97927a7cc8f4
parent	1634cb448ab0689814a7c1add18cef5c41cc000f (diff)
parent	d13abf368f7e68aeb7bf2a58ad9a5e6b47eb3385 (diff)